diff options
| author | Graham Christensen <graham@grahamc.com> | 2021-10-04 15:05:23 -0400 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2021-11-22 22:09:50 +0200 |
| commit | 6cfd23fa0b30b696e10e5f2e25adb53fa678c20c (patch) | |
| tree | fa3880e488e14f8bdfdb6778491fb1b1a9a698ab | |
| parent | 2676de37fe0a62f983f14eefb5ef3d54fc40c963 (diff) | |
| download | nixpkgs-6cfd23fa0b30b696e10e5f2e25adb53fa678c20c.tar nixpkgs-6cfd23fa0b30b696e10e5f2e25adb53fa678c20c.tar.gz nixpkgs-6cfd23fa0b30b696e10e5f2e25adb53fa678c20c.tar.bz2 nixpkgs-6cfd23fa0b30b696e10e5f2e25adb53fa678c20c.tar.lz nixpkgs-6cfd23fa0b30b696e10e5f2e25adb53fa678c20c.tar.xz nixpkgs-6cfd23fa0b30b696e10e5f2e25adb53fa678c20c.tar.zst nixpkgs-6cfd23fa0b30b696e10e5f2e25adb53fa678c20c.zip | |
nixos-install: support --no-root-password
| -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 91542d37cbd..eb6680b6567 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 ea9667995e1..135ee1305f1 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) |