bind-mount ordering fix.

4 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 72c705b..6c66a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-20  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-checkparams: sort and reverse-sort bindmounts
+	* pbuilder-modules: 
+
 2006-08-15  Junichi Uekawa  <dancer@debian.org>
 
 	* debian/control (Recommends): recommend cowdancer, for those
diff --git a/debian/changelog b/debian/changelog
index ada35c3..36fd7ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-pbuilder (0.157) UNRELEASED; urgency=low
+pbuilder (0.157) unstable; urgency=low
 
   [Junichi Uekawa]
   * Bug fix: "pbuilder: need a way to make --pkgname-logfile the default",
     thanks to Yann Dirson (Closes: #382885).
   * Standards-version: 3.7.2
   * add cowdancer to recommends.
+  * Bug fix: "bind-mount/umount ordering fix", thanks to martin f
+    krafft (Closes: #382977).
 
- -- Junichi Uekawa <dancer@debian.org>  Tue, 15 Aug 2006 22:12:39 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Sun, 20 Aug 2006 09:36:34 +0900
 
 pbuilder (0.156) unstable; urgency=low
 
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 6f393bd..ebb9c9c 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -263,3 +263,5 @@ case "$PBCURRENTCOMMANDLINEOPERATION" in
 	;;
 esac
 
+# sort BINDMOUNTS to ensure that deeper directories are mounted last
+BINDMOUNTS="$(for i in $BINDMOUNTS; do echo $i; done | sort -u)"
diff --git a/pbuilder-modules b/pbuilder-modules
index 4774d7a..accf717 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -126,7 +126,13 @@ function umountproc () {
 	fi
 	umount_one "proc"
     fi
+    # push arguments on a stack to reverse direction.
+    local reversed
+    reversed=
     for mnt in $BINDMOUNTS; do
+	reversed="$mnt $reversed"
+    done
+    for mnt in $reversed; do
 	umount_one "$mnt"
     done
 }