about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJookia <166291@gmail.com>2015-04-28 12:16:38 +1000
committerShea Levy <shea@shealevy.com>2015-04-28 06:37:04 -0400
commit71910be9ea225895e36f60ed23a1bdce402b3088 (patch)
tree1cb9d6be2649ce73ac3d8fcdd185155a2e9e3510 /nixos
parent7b37a5f168706db5efa33599354f5c1967ac4c51 (diff)
downloadnixlib-71910be9ea225895e36f60ed23a1bdce402b3088.tar
nixlib-71910be9ea225895e36f60ed23a1bdce402b3088.tar.gz
nixlib-71910be9ea225895e36f60ed23a1bdce402b3088.tar.bz2
nixlib-71910be9ea225895e36f60ed23a1bdce402b3088.tar.lz
nixlib-71910be9ea225895e36f60ed23a1bdce402b3088.tar.xz
nixlib-71910be9ea225895e36f60ed23a1bdce402b3088.tar.zst
nixlib-71910be9ea225895e36f60ed23a1bdce402b3088.zip
nixos-install: Fix chroot flag not defaulting to Bash outside NixOS.
Passing the chroot flag to nixos-install without arguments should now give you a
Bash shell as intended rather than try an empty path.

This was masked by the user's shell (usually /bin/bash) being defaulted to by
chroot, and being found since their paths used NixOS conventions.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/installer/tools/nixos-install.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 86e57f704c1b..097631eda9c9 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)