# exit on any error:
set -e
-GRML_LIVE_VERSION='0.9.5'
+GRML_LIVE_VERSION='0.9.6'
PN="$(basename $0)"
CMDLINE="$0 $@"
ISO_DATE="$(date +%Y-%m-%d)"
# clean exit {{{
bailout() {
- [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
rm -f /var/run/fai/fai_softupdate_is_running \
/var/run/fai/FAI_INSTALLATION_IN_PROGRESS
+ [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
[ -n "$1" ] && EXIT="$1" || EXIT="1"
[ -n "$2" ] && eerror "$2">&2
log "------------------------------------------------------------------------------"
exit "$EXIT"
}
-# trap bailout 1 2 3 6 9 14 15
-trap bailout 1 2 3 15
+trap bailout 1 2 3 3 6 9 14 15
# }}}
# check for important variables {{{
# }}}
# command line parsing {{{
-while getopts "a:C:c:g:i:o:r:s:t:v:bFhuVz" opt; do
+while getopts "a:C:c:g:i:o:r:s:t:v:bFuVz" opt; do
case "$opt" in
a) ARCH="$OPTARG" ;;
b) BUILD_ONLY=1 ;;
t) TEMPLATE_DIRECTORY="$OPTARG";;
v) VERSION="$OPTARG" ;;
F) FORCE=1 ;;
- h) usage ; bailout 0 ;;
u) UPDATE=1 ;;
V) VERBOSE="-v" ;;
z) SQUASHFS_ZLIB="-nolzma" ;;
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}"
# notice: 'fai dirinstall' does not seem to exit appropriate, so: