fi
# exit on any error:
-set -e
+# disable for now since it seems to cause some problems
+# set -e
# global variables
-GRML_LIVE_VERSION='0.13.2'
+GRML_LIVE_VERSION='0.14.1'
PN="$(basename $0)"
CMDLINE="$0 $@"
SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list'
. $LIVE_CONF
# }}}
+# umount all directories {{{
+umount_all() {
+ # make sure we don't leave any mounts - FAI doesn't remove them always
+ umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
+ umount $CHROOT_OUTPUT/sys 2>/dev/null || /bin/true
+ umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true
+ umount $CHROOT_OUTPUT/dev 2>/dev/null || /bin/true
+ [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+}
+# }}}
+
# clean exit {{{
bailout() {
rm -f /var/run/fai/fai_softupdate_is_running \
/var/run/fai/FAI_INSTALLATION_IN_PROGRESS
[ -n "$SQUASHFS_STDERR" ] && rm -rf "$SQUASHFS_STDERR"
- [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+ umount_all
[ -n "$1" ] && EXIT="$1" || EXIT="1"
[ -n "$2" ] && eerror "$2">&2
log "------------------------------------------------------------------------------"
exit "$EXIT"
}
-trap bailout 1 2 3 3 6 9 14 15
+trap bailout 1 2 3 3 6 9 14 15 EXIT
# }}}
# log file stuff {{{
done
# notice: activate grml-live pool only if we are building against unstable:
-if grep -qe unstable -qe sid "$SOURCES_LIST_FILE" ; then
+if grep -qwe unstable -qwe sid "$SOURCES_LIST_FILE" ; then
grep -q 'grml-live.*main' "$SOURCES_LIST_FILE" || \
grep grml-stable "$SOURCES_LIST_FILE" | \
sed 's/grml-stable/grml-live/' >> "$SOURCES_LIST_FILE"
rm -rf "$CHROOT_OUTPUT"/var/log/fai/*
fi
- # make sure we don't leave any mounts - FAI doesn't remove them always
- umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
- umount $CHROOT_OUTPUT/sys 2>/dev/null || /bin/true
- umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true
- umount $CHROOT_OUTPUT/dev 2>/dev/null || /bin/true
-
- [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+ umount_all
# notice: 'fai dirinstall' does not seem to exit appropriate, so:
ERROR=''
einfo "Creating hybrid ISO file with manifold method"
if [ "$HYBRID_METHOD" = "grub2" ] ; then
# 512 bytes: MBR, partition table, load GRUB 2
- echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 1:0x96 -g $cyls:16:32
+ echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 4:0x96 -g $cyls:16:32
else
# read only one but 2048-byte sized (scale: << 2) sector
echo $bootoff $bootoff | \
- mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 1:0x96 -g $cyls:16:32 -S 2
+ mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2
fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
eend $?
fi