public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13355 from grahamc/ttyNumberString-issue3608 

nixos-manual: Accept numbers for ttyNumber, closes #3608
This commit is contained in:
Franz Pletz 2016-02-22 19:34:16 +01:00
parent 4d767deaf5 f57c049e0b
commit 2d5e6a27fc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/misc/nixos-manual.nix
View File

@ -72,7 +72,8 @@ in
}; };
services.nixosManual.ttyNumber = mkOption { services.nixosManual.ttyNumber = mkOption {
default = "8"; type = types.int;
default = 8;
description = '' description = ''
Virtual console on which to show the manual. Virtual console on which to show the manual.
''; '';
@ -96,7 +97,7 @@ in
[ manual.manual help ] [ manual.manual help ]
++ optional config.programs.man.enable manual.manpages; ++ optional config.programs.man.enable manual.manpages;
boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"]; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];
systemd.services = optionalAttrs cfg.showManual systemd.services = optionalAttrs cfg.showManual
{ "nixos-manual" = { "nixos-manual" =
@ -106,7 +107,7 @@ in
{ ExecStart = "${cfg.browser} ${entry}"; { ExecStart = "${cfg.browser} ${entry}";
StandardInput = "tty"; StandardInput = "tty";
StandardOutput = "tty"; StandardOutput = "tty";
TTYPath = "/dev/tty${cfg.ttyNumber}"; TTYPath = "/dev/tty${toString cfg.ttyNumber}";
TTYReset = true; TTYReset = true;
TTYVTDisallocate = true; TTYVTDisallocate = true;
Restart = "always"; Restart = "always";