fix stage() function

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index de5a94a..5d9b699 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.
-# Latest change: Mon Apr 09 15:22:07 CEST 2007 [mika]
+# Latest change: Mon Apr 09 23:23:18 CEST 2007 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
@@ -60,6 +60,11 @@ bailout(){
   # make sure $TARGET is not mounted when exiting grml-debootstrap
   if [ -n "$TARGET" ] ; then
      if grep -q $TARGET /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"
      fi
@@ -81,10 +86,8 @@ stage() {
      return 1
   fi
   # main function
-  if [ -f "$STAGES/$1" ] ; then
-     if grep -q done "$STAGES/$1" ; then
-        ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
-     fi
+  if grep -q done "$STAGES/$1" 2>/dev/null ; then
+     ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
   else
      echo "$2" > "$STAGES/$1"
   fi
@@ -237,7 +240,9 @@ if [ "$FSCK" = 'yes' ] ; then
    stage fscktool done
 fi
 
-einfo "All stages have been executed, to rerun grml-debootstrap please manually remove ${STAGES}."
+# finally remove stages on main system so grml-deboostrap can be reexecuted
+  rm -rf "$STAGES"
+
 einfo "Finished execution of $0 - enjoy your Debian system." ; eend 0
 
 ## END OF FILE #################################################################