summary refs log tree commit diff
path: root/nixos/modules/services/ttys
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-07-16 18:28:02 +0100
committerJörg Thalheim <joerg@thalheim.io>2017-07-16 18:29:57 +0100
commitc2cf696430055498467dd9deec59939e8d52a43e (patch)
tree044f0f3563f855a71ce75b73813fa9355cb25e43 /nixos/modules/services/ttys
parentae26f291bcb6da0910fd3de47ff970e696f2c155 (diff)
downloadnixpkgs-c2cf696430055498467dd9deec59939e8d52a43e.tar
nixpkgs-c2cf696430055498467dd9deec59939e8d52a43e.tar.gz
nixpkgs-c2cf696430055498467dd9deec59939e8d52a43e.tar.bz2
nixpkgs-c2cf696430055498467dd9deec59939e8d52a43e.tar.lz
nixpkgs-c2cf696430055498467dd9deec59939e8d52a43e.tar.xz
nixpkgs-c2cf696430055498467dd9deec59939e8d52a43e.tar.zst
nixpkgs-c2cf696430055498467dd9deec59939e8d52a43e.zip
nixos/agetty: override upstream default
Since systemd 234 we keep default value for ExecStart in the upstream service file.
Therefor we need to override it in our module.
Diffstat (limited to 'nixos/modules/services/ttys')
-rw-r--r--nixos/modules/services/ttys/agetty.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 051d54e932f..f8dd75ea2c4 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -68,14 +68,19 @@ in
     services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>'';
 
     systemd.services."getty@" =
-      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM")
+        ];
         restartIfChanged = false;
       };
 
     systemd.services."serial-getty@" =
-      { serviceConfig.ExecStart =
-          let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
-          in gettyCmd "%I ${speeds} $TERM";
+      let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "%I ${speeds} $TERM")
+        ];
         restartIfChanged = false;
       };