projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for release 0.31
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
b59784f
..
cc97ebd
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-11,7
+11,7
@@
set -e # exit on any error
# variables {{{
PN="$(basename $0)"
# variables {{{
PN="$(basename $0)"
-VERSION='0.3
0
'
+VERSION='0.3
1
'
MNTPOINT="/mnt/debootstrap.$$"
# inside the chroot system locales might not be available, so use minimum:
MNTPOINT="/mnt/debootstrap.$$"
# inside the chroot system locales might not be available, so use minimum:
@@
-946,8
+946,14
@@
grub_install() {
}
# }}}
}
# }}}
-# unmount $MNTPOIN
R
T {{{
+# unmount $MNTPOINT {{{
umount_chroot() {
umount_chroot() {
+
+ # display installation notes:
+ if [ -n "$INSTALL_NOTES" ] ; then
+ [ -r "${MNTPOINT}/${INSTALL_NOTES}" ] && cat "${MNTPOINT}/${INSTALL_NOTES}"
+ fi
+
if [ -n "$ISODIR" ] ; then
if grep -q "$ISODIR" /proc/mounts ; then
einfo "Unmount $MNTPOINT/$ISODIR"
if [ -n "$ISODIR" ] ; then
if grep -q "$ISODIR" /proc/mounts ; then
einfo "Unmount $MNTPOINT/$ISODIR"
@@
-997,12
+1003,6
@@
if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
fi
# }}}
fi
# }}}
-# display installation notes {{{
-if [ -n "$INSTALL_NOTES" ] ; then
- [ -r "$INSTALL_NOTES" ] && cat "$INSTALL_NOTES"
-fi
-# }}}
-
# end dialog of autoinstallation {{{
if [ -n "$AUTOINSTALL" ] ; then
dialog --title "$PN" --msgbox \
# end dialog of autoinstallation {{{
if [ -n "$AUTOINSTALL" ] ; then
dialog --title "$PN" --msgbox \