projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1a8351e
)
Add $ISODIR for correct mounting
author
Michael Prokop
<mika@grml.org>
Tue, 5 Jun 2007 11:50:07 +0000
(13:50 +0200)
committer
Michael Prokop
<mika@grml.org>
Tue, 5 Jun 2007 11:50:07 +0000
(13:50 +0200)
grml-debootstrap
patch
|
blob
|
history
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
01fcfe8
..
27955fb
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-168,6
+168,7
@@
case $ISO in
ISO=file:$1
;;
esac
ISO=file:$1
;;
esac
+ISODIR=${ISO##file:}
# provide variables to chroot system
touch /etc/debootstrap/variables
# provide variables to chroot system
touch /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
[ -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>&1
einfo "Unmounting $MNTPOINT" ; umount "$MNTPOINT" ; eend $?
fi
fi
einfo "Unmounting $MNTPOINT" ; umount "$MNTPOINT" ; eend $?
fi
fi
@@
-296,9
+297,9
@@
mount_target() {
eend $?
fi
fi
eend $?
fi
fi
- if [ -n "$ISO" ] ; then
- mkdir
"$TARGET/$ISO
"
- mount --bind "$ISO
" "$TARGET/$ISO
"
+ if [ -n "$ISO
DIR
" ] ; then
+ mkdir
-p "$MNTPOINT/$ISODIR
"
+ mount --bind "$ISO
DIR" "$MNTPOINT/$ISODIR
"
fi
}
# }}}
fi
}
# }}}