swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-01 01:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140512 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
parent bdaa71a14a 6cfd23fa0b
commit 443b46dfde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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>

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

@ -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)