diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
| commit | 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch) | |
| tree | 6af7662b245e7998bd18ae20d9e74922c489fb6d /nixos/modules/installer/tools/nixos-install.sh | |
| parent | 2f75c6845981b38a698cf1a9f620145877c80956 (diff) | |
| parent | 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff) | |
| download | nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip | |
Merge staging into closure-size
Diffstat (limited to 'nixos/modules/installer/tools/nixos-install.sh')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 14ae3daace0..097631eda9c 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -45,7 +45,9 @@ while [ "$#" -gt 0 ]; do ;; --chroot) runChroot=1 - chrootCommand=("$@") + if [[ "$@" != "" ]]; then + chrootCommand=("$@") + fi break ;; --help) @@ -254,8 +256,14 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \ chroot $mountPoint /nix/var/nix/profiles/system/activate +# Some systems may not be prepared to use NixOS' paths. +export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH +export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs +export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels + + # Ask the user to set a root password. -if [ "$(chroot $mountPoint nix-instantiate --eval '<nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then +if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi |