From f86a74ff68d1cd366b742d3991c33051989bcf6f Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Thu, 27 Dec 2012 15:37:42 +0100
Subject: Revert to using which, but only in non-d-i

which is only if /bin/sh does not exist
---
 debian/changelog | 3 +--
 functions        | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f74a38a..bb47d68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 debootstrap (1.0.46) UNRELEASED; urgency=low
 
-  * Find out /bin/sh using `type` instead of `which`, the latter not being
-    available in d-i.
+  * Use `which` to find out sh only if /bin/sh does not exist.
 
  -- Samuel Thibault <sthibault@debian.org>  Thu, 27 Dec 2012 14:53:43 +0100
 
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"
-- 
cgit v0.12