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

Merge pull request from NixOS/nixos-install/--no-root-password

Browse Source
This commit is contained in:
Artturi 2021-11-22 22:32:30 +02:00 committed by GitHub
commit 443b46dfde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
nixos
doc/manual
man-nixos-install.xml
modules/installer/tools
nixos-install.sh

13
nixos/doc/manual/man-nixos-install.xml
View File

@ -69,9 +69,14 @@
</arg> </arg>
<arg> <arg>
<arg choice='plain'> <group choice='req'>
<option>--no-root-passwd</option> <arg choice='plain'>
</arg> <option>--no-root-password</option>
</arg>
<arg choice='plain'>
<option>--no-root-passwd</option>
</arg>
</group>
</arg> </arg>
<arg> <arg>
@ -157,7 +162,7 @@
<listitem> <listitem>
<para> <para>
It prompts you for a password for the root account (unless 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> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

2
nixos/modules/installer/tools/nixos-install.sh
View File

@ -58,7 +58,7 @@ while [ "$#" -gt 0 ]; do
--no-channel-copy) --no-channel-copy)
noChannelCopy=1 noChannelCopy=1
;; ;;
--no-root-passwd) --no-root-password|--no-root-passwd)
noRootPasswd=1 noRootPasswd=1
;; ;;
--no-bootloader) --no-bootloader)