tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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

authored by Artturi and committed by GitHub 443b46df bdaa71a1

+10 -5
unified split
+9 -4
nixos/doc/manual/man-nixos-install.xml
··· 69 </arg> 70 71 <arg> 72 - <arg choice='plain'> 73 - <option>--no-root-passwd</option> 74 - </arg> 75 </arg> 76 77 <arg> ··· 157 <listitem> 158 <para> 159 It prompts you for a password for the root account (unless 160 - <option>--no-root-passwd</option> is specified). 161 </para> 162 </listitem> 163 </itemizedlist>
··· 69 </arg> 70 71 <arg> 72 + <group choice='req'> 73 + <arg choice='plain'> 74 + <option>--no-root-password</option> 75 + </arg> 76 + <arg choice='plain'> 77 + <option>--no-root-passwd</option> 78 + </arg> 79 + </group> 80 </arg> 81 82 <arg> ··· 162 <listitem> 163 <para> 164 It prompts you for a password for the root account (unless 165 + <option>--no-root-password</option> is specified). 166 </para> 167 </listitem> 168 </itemizedlist>
+1 -1
nixos/modules/installer/tools/nixos-install.sh
··· 58 --no-channel-copy) 59 noChannelCopy=1 60 ;; 61 - --no-root-passwd) 62 noRootPasswd=1 63 ;; 64 --no-bootloader)
··· 58 --no-channel-copy) 59 noChannelCopy=1 60 ;; 61 + --no-root-password|--no-root-passwd) 62 noRootPasswd=1 63 ;; 64 --no-bootloader)