From: Michael Prokop <mika@grml.org>
Date: Fri, 26 Feb 2010 12:24:49 +0000 (+0100)
Subject: Do NOT execute umount -a in chroot.
X-Git-Tag: v0.35~2
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=0844fd956f409197b47b3d263ddc54c310cf892b;ds=sidebyside

Do NOT execute umount -a in chroot.
---

diff --git a/chroot-script b/chroot-script
index f20faf0..bbd834f 100755
--- a/chroot-script
+++ b/chroot-script
@@ -419,15 +419,14 @@ services() {
 }
 # }}}
 
-# unmount all filesystems in chroot, make sure nothing is left {{{
+# unmount /proc and make sure nothing is left {{{
 finalize() {
   # make sure we don't leave any sensible data
   rm -f /etc/debootstrap/variables
+
   [ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d
-  umount -a    1>/dev/null 2>/dev/null || true
-  umount /proc 1>/dev/null 2>/dev/null || true
-  umount /proc 1>/dev/null 2>/dev/null || true
-  umount -a    1>/dev/null 2>/dev/null || true
+
+  umount /proc >/dev/null 2>/dev/null || true
 }
 # }}}
 
diff --git a/grml-debootstrap b/grml-debootstrap
index 1c60bf4..f6de36b 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -994,6 +994,12 @@ done
 # }}}
 
 # finalize {{{
+if [ -n "$ISODIR" ] ; then
+   einfo "Unmounting Debian image loopback from $MNTPOINT/$ISODIR."
+   umount "$MNTPOINT/$ISODIR"
+   eend $?
+fi
+
 einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES" ; eend $?
 einfo "Removing ${STAGES}" ; rmdir "$STAGES" ; eend $?