Do NOT execute umount -a in chroot.

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index bdc326c..f6de36b 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -58,6 +58,8 @@ Configuration options:
   -d, --confdir <path>     Place of config files for debootstrap, defaults
                              to /etc/debootstrap
       --packages <file>    Install packages defined in specified list file.
+      --nopackages         Skip installation of packages defined in
+                             /etc/debootstrap/packages
       --debconf <file>     Pre-seed packages using specified pre-seed db file.
       --keep_src_list      Do not overwrite user provided apt sources.list.
       --hostname <name>    Hostname of Debian system.
@@ -794,6 +796,7 @@ preparechroot() {
   [ -n "$ROOTPASSWORD" ]  && echo "ROOTPASSWORD=$ROOTPASSWORD" >> $CHROOT_VARIABLES
   [ -n "$TARGET" ]        && echo "TARGET=$TARGET"             >> $CHROOT_VARIABLES
   [ -n "$TARGET_UUID" ]   && echo "TARGET_UUID=$TARGET_UUID"   >> $CHROOT_VARIABLES
+  [ -n "$RM_APTCACHE" ]   && echo "RM_APTCACHE=$RM_APTCACHE"   >> $CHROOT_VARIABLES
 
   cp $VERBOSE $CONFFILES/chroot-script $MNTPOINT/bin/chroot-script
   chmod 755 $MNTPOINT/bin/chroot-script
@@ -991,6 +994,12 @@ done
 # }}}
 
 # finalize {{{
+if [ -n "$ISODIR" ] ; then
+   einfo "Unmounting Debian image loopback from $MNTPOINT/$ISODIR."
+   umount "$MNTPOINT/$ISODIR"
+   eend $?
+fi
+
 einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES" ; eend $?
 einfo "Removing ${STAGES}" ; rmdir "$STAGES" ; eend $?