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.11.0'
+GRML_LIVE_VERSION='0.14.1'
PN="$(basename $0)"
CMDLINE="$0 $@"
SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list'
-u update existing chroot instead of rebuilding it from scratch
-v <version_number> specify version number of the release
-V increase verbosity in the build process
- -z use ZLIB instead of LZMA compression
+ -z use ZLIB instead of LZMA/XZ compression
Usage examples:
. $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 umount_all EXIT
# }}}
# log file stuff {{{
F) FORCE=1 ;;
u) UPDATE=1 ;;
V) VERBOSE="-v" ;;
- z) SQUASHFS_ZLIB="true" ;;
+ z) SQUASHFS_ZLIB=1 ;;
?) echo "invalid option -$OPTARG" >&2; bailout 1 ;;
esac
done
[ -n "$GRML_FAI_CONFIG" ] || GRML_FAI_CONFIG='/etc/grml/fai'
[ -n "$GRML_NAME" ] || GRML_NAME='grml'
[ -n "$HOSTNAME" ] || HOSTNAME='grml'
+[ -n "$HYBRID_METHOD" ] || HYBRID_METHOD='manifold'
[ -n "$NFSROOT_CONF" ] || NFSROOT_CONF='/etc/grml/fai/make-fai-nfsroot.conf'
[ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks'
[ -n "$SQUASHFS_EXCLUDES_FILE " ] || SQUASHFS_EXCLUDES_FILE='/etc/grml/fai/squashfs-excludes'
-[ -n "$SUITE" ] || SUITE='lenny'
+[ -n "$SUITE" ] || SUITE='squeeze'
[ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
[ -n "$USERNAME" ] || USERNAME='grml'
[ -n "$VERSION" ] || VERSION='0.0.1'
[ -n "$SUITE" ] && echo " Debian suite: $SUITE"
[ -n "$ARCH" ] && echo " Architecture: $ARCH"
[ -n "$BOOT_METHOD" ] && echo " Boot method: $BOOT_METHOD"
+ [ -n "$HYBRID_METHOD" ] && echo " Hybrid method: $HYBRID_METHOD"
[ -n "$TEMPLATE_DIRECTORY" ] && echo " Template files: $TEMPLATE_DIRECTORY"
[ -n "$CHROOT_INSTALL" ] && echo " Install files from directory to chroot: $CHROOT_INSTALL"
[ -n "$BOOTID" ] && echo " Boot identifier: $BOOTID"
[ -n "$DEFAULT_BOOTOPTIONS" ] && echo " Adding default bootoptions: \"$DEFAULT_BOOTOPTIONS\""
[ -n "$FAI_ARGS" ] && echo " Additional arguments for FAI: $FAI_ARGS"
[ -n "$LOGFILE" ] && echo " Logging to file: $LOGFILE"
- [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead of LZMA) compression."
+ [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead of LZMA/XZ) compression."
[ -n "$SQUASHFS_OPTIONS" ] && echo " Using SQUASHFS_OPTIONS ${SQUASHFS_OPTIONS}"
[ -n "$VERBOSE" ] && echo " Using VERBOSE mode."
[ -n "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation."
etch) ;;
lenny) ;;
squeeze) ;;
+ wheezy) ;;
sid) ;;
*) echo "Sorry, $SUITE is not a valid Debian suite, exiting.">&2; bailout 1 ;;
esac
-DIST=" etch\| stable\| lenny\| squeeze\| testing\| sid\| unstable"
+DIST=" etch\| stable\| lenny\| squeeze\| wheezy\| testing\| sid\| unstable"
sed "s/\(^deb .\+\)\([ \t]*\)\($DIST\)\([ \t]*\)\(main \)/\1 \2$SUITE\4\5/" "$SOURCES_LIST_FILE" | sponge "$SOURCES_LIST_FILE"
for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
if [ -n "$file" ] ; then
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"
fi
if [ -d "$CHROOT_OUTPUT/bin" -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then
- log "Skiping stage 'fai dirinstall' as $CHROOT_OUTPUT exists already."
- ewarn "Skiping stage 'fai dirinstall' as $CHROOT_OUTPUT exists already." ; eend 0
+ log "Skipping stage 'fai dirinstall' as $CHROOT_OUTPUT exists already."
+ ewarn "Skipping stage 'fai dirinstall' as $CHROOT_OUTPUT exists already." ; eend 0
else
mkdir -p "$CHROOT_OUTPUT" || bailout 5 "Problem with creating $CHROOT_OUTPUT for FAI"
# Remove all FAI logs from chroot if class RELEASE is used:
if [ -f "$CHROOT_OUTPUT"/etc/grml_fai_release ] ; then
rm -rf "$CHROOT_OUTPUT"/var/log/fai/*
+ rm -f "$CHROOT_OUTPUT"/var/log/install_packages.list
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=''
# generate addon list
rm "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"
- for name in $(ls "${BUILD_OUTPUT}"/boot/isolinux/addon_*.cfg) ; do
+ for name in "${BUILD_OUTPUT}"/boot/isolinux/addon_*.cfg ; do
include_name=$(basename "$name")
echo "include $include_name" >> "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"
done
# use blocksize 256k as this gives best result with regards to time + compression
SQUASHFS_OPTIONS="-b 256k"
- # set lzma compression by default, unless -z option has been specified on command line
+ # set lzma/xz compression by default, unless -z option has been specified on command line
if [ -z "$SQUASHFS_ZLIB" ] ; then
- SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -comp lzma"
+ SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -comp xz"
+ else
+ SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -comp gzip"
fi
fi
# informational stuff
[ -n "$SQUASHFS_OPTIONS" ] && SQUASHFS_INFO_MSG="$SQUASHFS_OPTIONS"
- [ -n "$SQUASHFS_ZLIB" ] && SQUASHFS_INFO_MSG="$SQUASHFS_INFO_MSG $SQUASHFS_ZLIB"
[ -n "$SQUASHFS_INFO_MSG" ] && SQUASHFS_INFO_MSG="using options: $SQUASHFS_INFO_MSG"
einfo "Squashfs build information: running binary $SQUASHFS_BINARY $SQUASHFS_INFO_MSG"
- log "$SQUASHFS_BINARY $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB"
+ log "$SQUASHFS_BINARY $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS"
if $SQUASHFS_BINARY $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs \
- -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB 2>"${SQUASHFS_STDERR}" ; then
+ -noappend $SQUASHFS_OPTIONS 2>"${SQUASHFS_STDERR}" ; then
echo "${GRML_NAME}.squashfs" > $BUILD_OUTPUT/live/filesystem.module
log "Finished execution of stage 'squashfs' [$(date)]"
einfo "Finished execution of stage 'squashfs'" ; eend 0
[ -n "$ISO_NAME" ] || ISO_NAME="${GRML_NAME}_${VERSION}.iso"
if [ "$BOOT_METHOD" = "isolinux" ] ; then
- BOOT_FILE="boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
+ BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
elif [ "$BOOT_METHOD" = "grub" ] ; then
- BOOT_FILE="boot/grub/stage2"
+ BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/grub/stage2"
+elif [ "$BOOT_METHOD" = "grub2" ] ; then
+ BOOT_ARGS="-no-emul-boot -boot-load-size 4 -b boot/grub/toriboot.bin"
+fi
+
+# Just until http://bts.grml.org/grml/issue945 has been resolved.
+# HYBRID_METHOD defaults to manifold, so make sure the default works OOTB.
+if [[ $BOOT_METHOD != isolinux && ($HYBRID_METHOD = isohybrid || $HYBRID_METHOD = manifold) ]]; then
+ log "Setting HYBRID_METHOD to grub2 as hybrid mode does not work with isohybrid yet."
+ ewarn "Setting HYBRID_METHOD to grub2 as hybrid mode does not work with isohybrid yet."
+ HYBRID_METHOD='grub2'
+ eend 0
fi
if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" -a "$FORCE_ISO_REBUILD" = "false" ] ; then
CURRENT_DIR=$(pwd)
if cd "$BUILD_OUTPUT" ; then
- log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."
+ if [ "$BOOT_METHOD" = "grub2" ]; then
+ # make a 2048-byte bootsector for El Torito
+ dd if=/dev/zero of=boot/grub/toriboot.bin bs=512 count=4 2>/dev/null
+ # those are in 2048-byte sectors, so 1 16 matches 4 63 below
+ echo 1 16 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -B 11 | \
+ dd of=boot/grub/toriboot.bin conv=notrunc 2>/dev/null
+ fi
+ log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J $BOOT_ARGS -o ${ISO_OUTPUT}/${ISO_NAME} ."
"$MKISOFS" -V "${GRML_NAME} ${VERSION}" -publisher 'grml-live | grml.org' \
- -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table \
- -b $BOOT_FILE -no-pad \
+ -l -r -J $BOOT_ARGS -no-pad \
-o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
+ # both of these need core.img there, so it’s easier to write it here
+ if [ "$BOOT_METHOD" = "grub2" ] || [ "$HYBRID_METHOD" = "grub2" ]; then
+ # must be <= 30720 bytes
+ dd if=boot/grub/core.img of="${ISO_OUTPUT}/${ISO_NAME}" \
+ conv=notrunc bs=512 seek=4 2>/dev/null
+ fi
# pad the output ISO to multiples of 256 KiB for partition table support
siz=$($getfilesize "${ISO_OUTPUT}/${ISO_NAME}")
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 4:0x96 -g $cyls:16:32
- # pad to a whole of 2048 bytes (one CD sector)
- dd if=/dev/zero bs=512 count=3 2>/dev/null
- # append GRUB 2 (must be <=30720 bytes)
- cat boot/grub/core.img
else
# read only one but 2048-byte sized (scale: << 2) sector
echo $bootoff $bootoff | \