summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-08-21 18:35:57 -0400
committerJoey Hess <joey@kitenet.net>2011-08-21 18:36:36 -0400
commit6744d37bf982b5dedf94082701bb778a4ae80d79 (patch)
tree756a5357aeb8e157a81fa067e914903f41828095
parent804a6a4349944f2fa8ad146d8e7794ae19c09d58 (diff)
downloaddebootstrap-6744d37bf982b5dedf94082701bb778a4ae80d79.tar.gz
Workaround for umount bug #634107, which broke pbuilder and "debootstrap ."
umount /path/to/foo fails when run in in /path/to/. Work around this nasty bug with a chdir /. Note that TARGET is an absolute path, so chdiring away is safe.
-rw-r--r--debian/changelog2
-rw-r--r--functions2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a13a247..9377a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ debootstrap (1.0.36) UNRELEASED; urgency=low
filesystems.
* When debootstrapping on FreeBSD, warn if necessary modules are not
loaded. Thanks, Arno Toell.
+ * Workaround for umount bug #634107, which broke pbuilder and "debootstrap ."
+ Closes: #631087
-- Joey Hess <joeyh@debian.org> Mon, 15 Aug 2011 14:14:29 -0400
diff --git a/functions b/functions
index aaeb7c5..44a071d 100644
--- a/functions
+++ b/functions
@@ -943,7 +943,7 @@ UMOUNT_DIRS=
umount_exit_function () {
for dir in $UMOUNT_DIRS; do
- umount "$TARGET/${dir#/}" || true
+ ( cd / ; umount "$TARGET/${dir#/}" ) || true
done
}