about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-07-31 09:12:15 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-07-31 09:12:15 +0200
commit740d76371e6c1c76bae4801fc5b736a796c1ebbe (patch)
tree3ea7c544ae005bd5d7c19cb45fb17a886baeb729 /nixos/modules
parent2a48a62b9cfe99140bfa9d45fca960be848f87fe (diff)
parentba68231273bea4cba01413fd2a0e56d68db9234c (diff)
downloadnixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar
nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.gz
nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.bz2
nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.lz
nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.xz
nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.tar.zst
nixlib-740d76371e6c1c76bae4801fc5b736a796c1ebbe.zip
Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD
Diffstat (limited to 'nixos/modules')
-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 051d54e932fb..f8dd75ea2c46 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;
       };