diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-10-28 10:41:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-28 10:41:59 +0000 |
| commit | 9ab20a4a04c5a82af76f0fd1d1f138c24f47469a (patch) | |
| tree | bee35ba111fa3feb80520f8e51532c4a1bc2ff0f /nixos | |
| parent | b5503b115e94ff4b0d38c65a25bda38a1d6ced04 (diff) | |
| parent | b2c5075e8ad442a8a2b42979ea9351e35dc647fe (diff) | |
Merge pull request #30787 from lheckemann/nixos-help-doc
Document nixos-help more obviously
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/installation/installing.xml | 3 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 8c37643c08f5c..94d8e9d2e1a39 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -16,7 +16,8 @@ hardware.</para></listitem> <listitem><para>The NixOS manual is available on virtual console 8 - (press Alt+F8 to access).</para></listitem> + (press Alt+F8 to access) or by running <command>nixos-help</command>. + </para></listitem> <listitem><para>You get logged in as <literal>root</literal> (with empty password).</para></listitem> diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 515864ec2e2de..41cadb4a6de02 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -135,8 +135,9 @@ in }; }; - services.mingetty.helpLine = mkIf cfg.showManual - "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual."; + services.mingetty.helpLine = "\nRun `nixos-help` " + + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> " + + "for the NixOS manual."; }; |