diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
| commit | 7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566 (patch) | |
| tree | f10b8dd05c774ed6cf9afba85426abbf4527f2a0 /nixos/modules/services | |
| parent | f08e3e38d4bf983480fcde77911136bab70d8e80 (diff) | |
| parent | 7e8454fb856573967a70f61116e15f879f2e3f6a (diff) | |
| download | nixlib-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar nixlib-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.gz nixlib-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.bz2 nixlib-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.lz nixlib-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.xz nixlib-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.zst nixlib-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/rogue.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 20ba3d8ef0bc..ab73f49d4be5 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -52,7 +52,7 @@ in }; }) (mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) { - boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; + console.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; systemd.services.nixos-manual = { description = "NixOS Manual"; diff --git a/nixos/modules/services/misc/rogue.nix b/nixos/modules/services/misc/rogue.nix index aae02e384c97..d56d103b5f34 100644 --- a/nixos/modules/services/misc/rogue.nix +++ b/nixos/modules/services/misc/rogue.nix @@ -40,7 +40,7 @@ in config = mkIf cfg.enable { - boot.extraTTYs = [ cfg.tty ]; + console.extraTTYs = [ cfg.tty ]; systemd.services.rogue = { description = "Rogue dungeon crawling game"; |