Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!
| author | Michael Prokop <mika@grml.org> |
| Tue Jun 05 13:50:07 2007 +0200 (18 months ago) | |
| changeset 175 | b2622e830882 |
| manifest | b2622e830882 |
| parent 174 | 88b081098b85 |
| child 176 | 0453b6660ed7 |
--- a/grml-debootstrap Tue Jun 05 13:41:22 2007 +0200+++ b/grml-debootstrap Tue Jun 05 13:50:07 2007 +0200@@ -168,6 +168,7 @@ case $ISO inISO=file:$1;;esac+ISODIR=${ISO##file:}# provide variables to chroot systemtouch /etc/debootstrap/variables@@ -202,7 +203,7 @@ bailout(){[ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a 1>/dev/null 2>&1[ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /proc 1>/dev/null 2>&1[ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /proc 1>/dev/null 2>&1- [ -d "$TARGET/$ISO" ] && umount "$TARGET/$ISO"+ [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" 1>/dev/null 2>&1einfo "Unmounting $MNTPOINT" ; umount "$MNTPOINT" ; eend $?fifi@@ -296,9 +297,9 @@ mount_target() {eend $?fifi- if [ -n "$ISO" ] ; then- mkdir "$TARGET/$ISO"- mount --bind "$ISO" "$TARGET/$ISO"+ if [ -n "$ISODIR" ] ; then+ mkdir -p "$MNTPOINT/$ISODIR"+ mount --bind "$ISODIR" "$MNTPOINT/$ISODIR"fi}# }}}