summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com>2020-12-18 08:10:49 +0100
committerGitHub <noreply@github.com>2020-12-18 08:10:49 +0100
commit9a5e66f5d4bd16454b6bf1e7303ca86737f98ab3 (patch)
tree706c4616b9e818f5f7b90dadbc61ee7193ba6998
parent85298db412bc3f768d0eba099f69a8014525c5dc (diff)
parent9728907cd34136a8c2db38f0657920cf905106dc (diff)
Merge pull request #107118 from rnhmjoj/ttys
console: remove console.extraTTYs option
-rw-r--r--nixos/modules/config/console.nix18
1 files changed, 4 insertions, 14 deletions
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index f662ed62d31d..b8d52d1a8fc7 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -90,20 +90,6 @@ in
'';
};
- extraTTYs = mkOption {
- default = [];
- type = types.listOf types.str;
- example = ["tty8" "tty9"];
- description = ''
- TTY (virtual console) devices, in addition to the consoles on
- which mingetty and syslogd run, that must be initialised.
- Only useful if you have some program that you want to run on
- some fixed console. For example, the NixOS installation CD
- opens the manual in a web browser on console 7, so it sets
- <option>console.extraTTYs</option> to <literal>["tty7"]</literal>.
- '';
- };
-
useXkbConfig = mkOption {
type = types.bool;
default = false;
@@ -199,5 +185,9 @@ in
(mkRenamedOptionModule [ "i18n" "consoleUseXkbConfig" ] [ "console" "useXkbConfig" ])
(mkRenamedOptionModule [ "boot" "earlyVconsoleSetup" ] [ "console" "earlySetup" ])
(mkRenamedOptionModule [ "boot" "extraTTYs" ] [ "console" "extraTTYs" ])
+ (mkRemovedOptionModule [ "console" "extraTTYs" ] ''
+ Since NixOS switched to systemd (circa 2012), TTYs have been spawned on
+ demand, so there is no need to configure them manually.
+ '')
];
}