# 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
[ -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
fi
# make sure we have the right syntax when using an iso image
-case $ISO in
- file*) # do nothing
- ;;
- *)
- ISO=file:$1
- ;;
-esac
+if [ -n "$ISO" ] ; then
+ case $ISO in
+ file*) # do nothing
+ ;;
+ *)
+ ISO=file:$1
+ ;;
+ esac
+fi
ISODIR=${ISO##file:}
+ISODIR=${ISODIR%%/}
# provide variables to chroot system
touch /etc/debootstrap/variables
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
}
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
fi
## END OF FILE #################################################################
-# vim: ai tw=100 expandtab foldmethod=marker
+# vim: ai tw=100 expandtab foldmethod=marker shiftwidth=3