Improve bailout function

diff --git a/grml-debootstrap b/grml-debootstrap
index 7a5c9f0..9b0574c 100644 (file)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Mon Apr 16 13:11:33 CEST 2007 [mika]
+# Latest change: Mon Apr 16 13:21:01 CEST 2007 [mika]

 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 


@@ -110,15 +110,14 @@ fi
 # we want to exit smoothly and clean:
 bailout(){
   # make sure $TARGET is not mounted when exiting grml-debootstrap
 # we want to exit smoothly and clean:
 bailout(){
   # make sure $TARGET is not mounted when exiting grml-debootstrap

-  if [ -n "$TARGET" ] ; then
-     if grep -q $TARGET /proc/mounts ; then
+  if [ -n "$MNTPOINT" ] ; then
+     if grep -q $MNTPOINT /proc/mounts ; then

         # make sure nothing is left inside chroot so we can unmount it
         # make sure nothing is left inside chroot so we can unmount it

-        [ -x "$TARGET"/etc/init.d/ssh   ] && "$TARGET"/etc/init.d/ssh stop
-        [ -x "$TARGET"/etc/init.d/mdadm ] && "$TARGET"/etc/init.d/mdadm stop
-        chroot "$TARGET" umount /sys  1>/dev/null 2>&1
-        chroot "$TARGET" umount /proc 1>/dev/null 2>&1
-        echo "Unmounting $TARGET"
-        umount "$TARGET"
+        [ -x "$MNTPOINT"/etc/init.d/ssh   ] && "$MNTPOINT"/etc/init.d/ssh stop
+        [ -x "$MNTPOINT"/etc/init.d/mdadm ] && "$MNTPOINT"/etc/init.d/mdadm stop
+        [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /sys
+        [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /proc
+        echo "Unmounting $MNTPOINT" ; umount "$MNTPOINT"

      fi
   fi
   [ -n "$1" ] && EXIT="$1" || EXIT="1"
      fi
   fi
   [ -n "$1" ] && EXIT="$1" || EXIT="1"