diff options
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/man-nixos-install.xml | 13 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 91542d37cbd55..eb6680b65677e 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -69,9 +69,14 @@ </arg> <arg> - <arg choice='plain'> - <option>--no-root-passwd</option> - </arg> + <group choice='req'> + <arg choice='plain'> + <option>--no-root-password</option> + </arg> + <arg choice='plain'> + <option>--no-root-passwd</option> + </arg> + </group> </arg> <arg> @@ -157,7 +162,7 @@ <listitem> <para> It prompts you for a password for the root account (unless - <option>--no-root-passwd</option> is specified). + <option>--no-root-password</option> is specified). </para> </listitem> </itemizedlist> diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index ea9667995e13f..135ee1305f122 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -58,7 +58,7 @@ while [ "$#" -gt 0 ]; do --no-channel-copy) noChannelCopy=1 ;; - --no-root-passwd) + --no-root-password|--no-root-passwd) noRootPasswd=1 ;; --no-bootloader) |