X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=d191161f3b11f851066410341423583fad0d0aaf;hp=cbd131abc4e0bf058f9bd2315fb80477f6312aa8;hb=96c09943bc092ce76eadff272fb8c292f711c249;hpb=cba387c584bdf456daae4d60a7213c0153cb3f84

diff --git a/grml-debootstrap b/grml-debootstrap
index cbd131a..d191161 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,13 +4,13 @@
 # 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: Die Jun 05 14:04:47 CEST 2007 [mika]
+# Latest change: Sam Okt 06 18:01:53 CEST 2007 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
 set -e # exit on any error
 
-VERSION='0.10'
+VERSION='0.11'
 
 # source core functions {{{
 . /etc/grml/lsb-functions
@@ -125,7 +125,7 @@ if [ -z "$STAGES" ] ; then
    [ -d "$STAGES" ] || mkdir -p "$STAGES"
 fi
 
-if [ -r $STAGES/grml-debootstrap ] ; then
+if [ -r "$STAGES"/grml-debootstrap ] ; then
    if grep -q done $STAGES/grml-debootstrap ; then
       eerror "Error: grml-debootstrap has been executed already, won't continue therefore."
       eerror "If you want to re-execute grml-debootstrap just manually remove ${STAGES}" ; eend 1
@@ -169,6 +169,7 @@ case $ISO in
     ;;
 esac
 ISODIR=${ISO##file:}
+ISODIR=${ISODIR%%/}
 
 # provide variables to chroot system
 touch /etc/debootstrap/variables
@@ -221,6 +222,9 @@ stage() {
      return 0
   elif grep -q done "$STAGES/$1" 2>/dev/null ; then
      ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
+     eindent
+       ewarn "To reexecute it clean up the according directory inside $STAGES" ; eend 0
+     eoutdent
      return 1
   fi
 }
@@ -392,7 +396,7 @@ umount_chroot() {
         eend $?
      fi
   fi
-  if grep -q "$PARTITION" /proc/mounts ; then
+  if grep -q "$MNTPOINT" /proc/mounts ; then
      if [ -n "$PARTITION" ] ; then
         einfo "Unmount $MNTPOINT"
         umount $MNTPOINT