projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d3fd17
)
Extend $ISODIR
author
Michael Prokop
<mika@grml.org>
Tue, 5 Jun 2007 12:23:51 +0000
(14:23 +0200)
committer
Michael Prokop
<mika@grml.org>
Tue, 5 Jun 2007 12:23:51 +0000
(14:23 +0200)
grml-debootstrap
patch
|
blob
|
history
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
ae1f80d
..
d9d3202
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-4,7
+4,7
@@
# 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.
# 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:
06:21
CEST 2007 [mika]
+# Latest change: Die Jun 05 14:
23:38
CEST 2007 [mika]
################################################################################
# http://www.debian.org/releases/stable/i386/index.html.en
################################################################################
# http://www.debian.org/releases/stable/i386/index.html.en
@@
-169,6
+169,7
@@
case $ISO in
;;
esac
ISODIR=${ISO##file:}
;;
esac
ISODIR=${ISO##file:}
+ISODIR=${ISODIR%%/}
# provide variables to chroot system
touch /etc/debootstrap/variables
# provide variables to chroot system
touch /etc/debootstrap/variables
@@
-386,7
+387,7
@@
grub_install() {
# unmount $MNTPOINRT {{{
umount_chroot() {
if [ -n "$ISODIR" ] ; then
# unmount $MNTPOINRT {{{
umount_chroot() {
if [ -n "$ISODIR" ] ; then
- if grep -q "$
MNTPOINT/$
ISODIR" /proc/mounts ; then
+ if grep -q "$ISODIR" /proc/mounts ; then
einfo "Unmount $MNTPOINT/$ISODIR"
umount "$MNTPOINT/$ISODIR"
eend $?
einfo "Unmount $MNTPOINT/$ISODIR"
umount "$MNTPOINT/$ISODIR"
eend $?