X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=7a14e5f3c8b6bc0b6b2638f122616d1a18e32571;hp=7a5c9f066b19511c3c2501297ee7ecba3226a7e1;hb=70523bae4fa751641712d49304dd17879a5056f7;hpb=c4ffcff0a85b654adc06e0b1fe4ef06927e20b26

diff --git a/grml-debootstrap b/grml-debootstrap
index 7a5c9f0..7a14e5f 100644
--- 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.
-# 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
 
@@ -110,15 +110,14 @@ fi
 # 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
-        [ -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
+        einfo "Unmounting $MNTPOINT" ; umount "$MNTPOINT" ; eend $?
      fi
   fi
   [ -n "$1" ] && EXIT="$1" || EXIT="1"
@@ -196,9 +195,17 @@ mount_target() {
 
 # install main chroot {{{
 debootstrap_system() {
-  einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using mirror $MIRROR"
-  $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR
-  eend $?
+  if ! grep -q $MNTPOINT /proc/mounts ; then
+          mount_target
+  fi
+  if grep -q $MNTPOINT /proc/mounts ; then
+     einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using mirror $MIRROR"
+     $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR
+     eend $?
+  else
+     eerror "Error: $MNTPOINT not mounted, can not continue."
+     eend 1
+  fi
 }
 # }}}