diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
commit | 00df204c82bd6d585c3f19d1a31588fa72519184 (patch) | |
tree | 4201fed8adf0505e787b9cf335cd52a7ad657570 /nixos/modules/installer/tools/nixos-install.sh | |
parent | 8591db4b10e50ad3b61b1708787e4de314424d5d (diff) | |
parent | cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff) | |
download | nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2 nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/modules/installer/tools/nixos-install.sh')
-rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 097631eda9c9..b1f4772d5705 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -263,7 +263,7 @@ export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix # Ask the user to set a root password. -if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then +if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi |