summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2021-06-25 09:50:52 +0200
committerFlorian Klink <flokli@flokli.de>2021-06-25 23:32:04 +0200
commitf4b92c297544dc5fa3a759ed15a9bf3d2520b8e1 (patch)
tree2788a4e52b4cd49fa1266b718d24b66b1898d4e1
parentMerge pull request #128142 from NixOS/backport-128082-to-release-21.05 (diff)
downloadnixpkgs-f4b92c297544dc5fa3a759ed15a9bf3d2520b8e1.tar.gz
nixos/getty: add missing --keep-baud
systemd ships `units/serial-getty@.service.m4` with the `--keep-baud` option. We override that unit, and didn't add the `--keep-baud` option. (We have it in our other getty options there). Having `--keep-baud` in `serial-getty@` makes a lot of sense - the console keeps working if it's initialized with a less standard baud rate, such as the [Helios64](https://wiki.kobol.io/helios64/intro/). (cherry picked from commit ba42d639f16dc774f4fa661243b640b034d7be0a)
-rw-r--r--nixos/modules/services/ttys/getty.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix
index 2480e681de8d..8345dfabeb7e 100644
--- a/nixos/modules/services/ttys/getty.nix
+++ b/nixos/modules/services/ttys/getty.nix
@@ -118,7 +118,7 @@ in
let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in
{ serviceConfig.ExecStart = [
"" # override upstream default with an empty ExecStart
- (gettyCmd "%I ${speeds} $TERM")
+ (gettyCmd "%I --keep-baud ${speeds} $TERM")
];
restartIfChanged = false;
};