summaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2012-12-27 14:37:42 (GMT)
committerSamuel Thibault <sthibault@debian.org>2012-12-27 14:37:42 (GMT)
commitf86a74ff68d1cd366b742d3991c33051989bcf6f (patch)
tree4c1a9253f255f7e5f871b6304699f9ff8d30f188 /functions
parentc7f32c0676e1238f0ba93a91e61419f309ecb51b (diff)
downloaddebootstrap-f86a74ff68d1cd366b742d3991c33051989bcf6f.zip
debootstrap-f86a74ff68d1cd366b742d3991c33051989bcf6f.tar.gz
debootstrap-f86a74ff68d1cd366b742d3991c33051989bcf6f.tar.bz2
Revert to using which, but only in non-d-i
which is only if /bin/sh does not exist
Diffstat (limited to 'functions')
-rw-r--r--functions5
1 files changed, 4 insertions, 1 deletions
diff --git a/functions b/functions
index 682636e..c1e938e 100644
--- a/functions
+++ b/functions
@@ -1299,8 +1299,11 @@ check_sane_mount () {
;;
esac
+ SH=/bin/sh
+ [ -x $SH ] || SH=`which sh`
+
cat > "$1/test-exec" <<EOF
-#! `type sh`
+#! $SH
:
EOF
chmod +x "$1/test-exec"