diff options
author | Robin Gloster <mail@glob.in> | 2017-09-02 23:29:04 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-09-02 23:29:04 +0200 |
commit | 0156db2da530a52265fbccc8ad7747b00ee8aaf3 (patch) | |
tree | f5facfdd70ac838997ed0538fd9f4e8edffe9936 /nixos/modules/services/ttys/agetty.nix | |
parent | 891a1662aa6cd6b2bcd2187d97f27822ed5df138 (diff) | |
parent | d784b830051bb86172b9a3669826774cc20e1f41 (diff) | |
download | nixlib-0156db2da530a52265fbccc8ad7747b00ee8aaf3.tar nixlib-0156db2da530a52265fbccc8ad7747b00ee8aaf3.tar.gz nixlib-0156db2da530a52265fbccc8ad7747b00ee8aaf3.tar.bz2 nixlib-0156db2da530a52265fbccc8ad7747b00ee8aaf3.tar.lz nixlib-0156db2da530a52265fbccc8ad7747b00ee8aaf3.tar.xz nixlib-0156db2da530a52265fbccc8ad7747b00ee8aaf3.tar.zst nixlib-0156db2da530a52265fbccc8ad7747b00ee8aaf3.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos/modules/services/ttys/agetty.nix')
-rw-r--r-- | nixos/modules/services/ttys/agetty.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index 051d54e932fb..3429397d2cc2 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -68,24 +68,35 @@ 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; }; systemd.services."container-getty@" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM") + ]; restartIfChanged = false; }; systemd.services."console-getty" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM") + ]; serviceConfig.Restart = "always"; restartIfChanged = false; enable = mkDefault config.boot.isContainer; |