summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Schneider <michael.schneider@cyberus-technology.de>2021-11-18 20:24:36 +0100
committerMichael Schneider <michael.schneider@cyberus-technology.de>2021-11-19 10:17:26 +0100
commit1331b3d252e92c78087b82afc44d912c28f1c5c4 (patch)
tree9c1790602d0042e2a8a3f3a8303259475b2b30b5
parentda059cffc1eada2d25a7ef61a73597fc617f9337 (diff)
downloadnixpkgs-1331b3d252e92c78087b82afc44d912c28f1c5c4.tar
nixpkgs-1331b3d252e92c78087b82afc44d912c28f1c5c4.tar.gz
nixpkgs-1331b3d252e92c78087b82afc44d912c28f1c5c4.tar.bz2
nixpkgs-1331b3d252e92c78087b82afc44d912c28f1c5c4.tar.lz
nixpkgs-1331b3d252e92c78087b82afc44d912c28f1c5c4.tar.xz
nixpkgs-1331b3d252e92c78087b82afc44d912c28f1c5c4.tar.zst
nixpkgs-1331b3d252e92c78087b82afc44d912c28f1c5c4.zip
nixos/getty: remove serialSpeed
It is expected that the baudrate is already initialized before the getty is started. Therefore the serialSpeed option is redundant.
-rw-r--r--nixos/modules/services/ttys/getty.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix
index 8c5b6e5e0cb..7021a2c80f8 100644
--- a/nixos/modules/services/ttys/getty.nix
+++ b/nixos/modules/services/ttys/getty.nix
@@ -24,6 +24,7 @@ in
 
   imports = [
     (mkRenamedOptionModule [ "services" "mingetty" ] [ "services" "getty" ])
+    (mkRemovedOptionModule [ "services" "getty" "serialSpeed" ] ''set non-standard baudrates with `boot.kernelParams` i.e. boot.kernelParams = ["console=ttyS2,1500000"];'')
   ];
 
   options = {
@@ -92,17 +93,6 @@ in
         '';
       };
 
-      serialSpeed = mkOption {
-        type = types.listOf types.int;
-        default = [ 115200 57600 38400 9600 ];
-        example = [ 38400 9600 ];
-        description = ''
-            Bitrates to allow for agetty's listening on serial ports. Listing more
-            bitrates gives more interoperability but at the cost of long delays
-            for getting a sync on the line.
-        '';
-      };
-
     };
 
   };
@@ -124,10 +114,9 @@ in
       };
 
     systemd.services."serial-getty@" =
-      let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in
       { serviceConfig.ExecStart = [
           "" # override upstream default with an empty ExecStart
-          (gettyCmd "%I --keep-baud ${speeds} $TERM")
+          (gettyCmd "%I --keep-baud $TERM")
         ];
         restartIfChanged = false;
       };