summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2012-12-27 14:14:13 (GMT)
committerSamuel Thibault <sthibault@debian.org>2012-12-27 14:14:13 (GMT)
commitc7f32c0676e1238f0ba93a91e61419f309ecb51b (patch)
tree57001d95c3fec5d660365cd1abf38b8a951a1ba5
parent3cda35e94edbe3dda009540a1761e1ac92bb9b94 (diff)
downloaddebootstrap-c7f32c0676e1238f0ba93a91e61419f309ecb51b.zip
debootstrap-c7f32c0676e1238f0ba93a91e61419f309ecb51b.tar.gz
debootstrap-c7f32c0676e1238f0ba93a91e61419f309ecb51b.tar.bz2
Find out /bin/sh using `type` instead of `which`,
the latter not being available in d-i.
-rw-r--r--debian/changelog7
-rw-r--r--functions2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b80eef8..f74a38a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debootstrap (1.0.46) UNRELEASED; urgency=low
+
+ * Find out /bin/sh using `type` instead of `which`, the latter not being
+ available in d-i.
+
+ -- Samuel Thibault <sthibault@debian.org> Thu, 27 Dec 2012 14:53:43 +0100
+
debootstrap (1.0.45) unstable; urgency=low
[ Joey Hess ]
diff --git a/functions b/functions
index 881231b..682636e 100644
--- a/functions
+++ b/functions
@@ -1300,7 +1300,7 @@ check_sane_mount () {
esac
cat > "$1/test-exec" <<EOF
-#! `which sh`
+#! `type sh`
:
EOF
chmod +x "$1/test-exec"