Fix the manual service on the installation CD

This commit is contained in:
Eelco Dolstra 2012-10-04 16:15:10 -04:00
parent 74be2d9707
commit 6c6134c2d2
2 changed files with 14 additions and 13 deletions

View File

@ -73,19 +73,19 @@ in
boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"]; boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
jobs = mkIf cfg.showManual boot.systemd.services = optionalAttrs cfg.showManual
{ nixosManual = { "nixos-manual" =
{ name = "nixos-manual"; { description = "NixOS Manual";
wantedBy = [ "multi-user.target" ];
description = "NixOS manual"; serviceConfig =
{ ExecStart = "${cfg.browser} ${manual.manual}/share/doc/nixos/manual.html";
startOn = "started udev"; StandardInput = "tty";
StandardOutput = "tty";
exec = TTYPath = "/dev/tty${cfg.ttyNumber}";
'' TTYReset = true;
${cfg.browser} ${manual.manual}/share/doc/nixos/manual.html \ TTYVTDisallocate = true;
< /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1 Restart = "always";
''; };
}; };
}; };

View File

@ -50,6 +50,7 @@ in
TTYPath = "/dev/${cfg.tty}"; TTYPath = "/dev/${cfg.tty}";
TTYReset = true; TTYReset = true;
TTYVTDisallocate = true; TTYVTDisallocate = true;
Restart = "always";
}; };
}; };