X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=50872acb343dbc3d96142c3b485a6a761b01b4fb;hp=67b339f03a90ffc514789c46f8557a2e698cffbc;hb=1370165b4b9780c2a0a46d72dc12fae343d9f67e;hpb=67304be75bd8ee0e517ea3f8e409c06fa7a00c26 diff --git a/grml-live b/grml-live index 67b339f..50872ac 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Dec 09 18:18:27 CET 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -15,10 +14,61 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.0.12' +GRML_LIVE_VERSION='0.9.6' +PN="$(basename $0)" CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" +# usage information {{{ +usage() +{ + echo " +$PN - build process script for generating a (grml based) Linux Live-ISO + +Usage: $PN [options, see as follows] + + -a architecture; available values: i386 and amd64 + -b build the ISO without updating the chroot via FAI + -c classes to be used for building the ISO via FAI + -C configuration file for grml-live + -F force execution without prompting + -g ] set the grml flavour name + -h display short usage information and exit + -i name of ISO + -o main output directory of the build process + -r release name + -s Debian suite; values: etch, lenny, sid + -t place of the templates + -u update existing chroot instead of rebuilding it from scratch + -v specify version number of the release + -V increase verbosity in the build process + -z use ZLIB instead of LZMA compression (depends on + squashfs-tools version) + +Usage examples: + + $PN + $PN -c GRMLBASE,GRML_MEDIUM,I386 -o /dev/shm/grml + $PN -c GRMLBASE,GRML_SMALL,REMOVE_DOCS,I386 -g grml-small -v 1.0 + $PN -c GRMLBASE,GRML_FULL,I386 -i grml_0.0-1.iso -v 0.0-1 + $PN -c GRMLBASE,GRML_FULL,I386 -s sid -V -r 'grml-live rocks' + +More details: man grml-live + /usr/share/doc/grml-live/grml-live.html + http://grml.org/grml-live/ + +Please send your bug reports and feedback to the grml-team: http://grml.org/bugs/ +" +} + +# make sure it's possible to get usage information without being +# root or actually executing the script +if [ "$1" = '-h' -o "$1" = '--help' ] ; then + usage + [ "$(id -u 2>/dev/null)" != 0 ] && echo "Please notice that this script requires root permissions." + exit 0 +fi +# }}} + # we need root permissions for the build-process: if [ "$(id -u 2>/dev/null)" != 0 ] ; then echo "Error: please run this script with uid 0 (root)." >&2 @@ -42,6 +92,8 @@ fi VERBOSE='' FORCE='' UPDATE='' +BUILD_ONLY='' +HOSTNAME='' if [ -r /etc/grml/lsb-functions ] ; then . /etc/grml/lsb-functions @@ -56,20 +108,19 @@ fi LIVE_CONF=/etc/grml/grml-live.conf . $LIVE_CONF -PN=$(basename $0) # }}} # clean exit {{{ bailout() { + rm -f /var/run/fai/fai_softupdate_is_running \ + /var/run/fai/FAI_INSTALLATION_IN_PROGRESS [ -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 "$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 {{{ @@ -90,7 +141,7 @@ if [ -z "$LOGFILE" ] ; then fi touch $LOGFILE chown root:adm $LOGFILE -chmod 640 $LOGFILE +chmod 664 $LOGFILE NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf @@ -145,40 +196,22 @@ extend_string_end() { } # }}} -# usage information {{{ -usage() -{ - echo " -$PN - build process script for generating a (grml based) Linux Live-ISO - -Usage: $PN [-a ] [-c ] [-g ] \\ - [-i ] [-o ] [-s ] \\ - [-t ] [-s ] \\ - [-v ] [-FVhu] - -Usage examples: - - $PN - $PN -c GRMLBASE,GRML_SMALL,I386 -o /grml/ - $PN -c GRMLBASE,GRML_MEDIUM,I386 -o /dev/shm/grml - $PN -c GRMLBASE,GRML_SMALL,I386 -g grml-small -v 1.0 - $PN -c GRMLBASE,GRML_FULL,I386 -i grml_0.0-1.iso -v 0.0-1 - $PN -c GRMLBASE,GRML_FULL,I386 -s sid -V -r 'grml-live rocks' - -More details: man grml-live - /usr/share/doc/grml-live/grml-live.html - -Please send your bug reports, feedback,.. to the grml-team. -http://grml.org/bugs/ -" -} +# read local (non-packaged) configuration {{{ +LOCAL_CONFIG=/etc/grml/grml-live.local +if [ -r "$LOCAL_CONFIG" ] ; then + log "Sourcing $LOCAL_CONFIG" + . $LOCAL_CONFIG +else + log "No $LOCAL_CONFIG found, not sourcing it" + LOCAL_CONFIG='' +fi # }}} # command line parsing {{{ - -while getopts "a:C:c:g:i:o:r:s:t:v:FhuVz" 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 ;; c) CLASSES="$OPTARG" ;; C) CONFIG="$OPTARG" ;; g) GRML_NAME="$OPTARG" ;; @@ -193,7 +226,6 @@ while getopts "a:C:c:g:i:o:r:s:t:v:FhuVz" opt; do t) TEMPLATE_DIRECTORY="$OPTARG";; v) VERSION="$OPTARG" ;; F) FORCE=1 ;; - h) usage ; bailout 0 ;; u) UPDATE=1 ;; V) VERBOSE="-v" ;; z) SQUASHFS_ZLIB="-nolzma" ;; @@ -208,24 +240,23 @@ shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter specify it on the command line using the -c option." [ -n "$OUTPUT" ] || bailout 1 "Error: \$OUTPUT unset, please set it in $LIVE_CONF or specify it on the command line using the -o option." -# }}} -# read local (non-packaged) configuration {{{ -LOCAL_CONFIG=/etc/grml/grml-live.local -if [ -r "$LOCAL_CONFIG" ] ; then - log "Sourcing $LOCAL_CONFIG" - . $LOCAL_CONFIG -else - log "No $LOCAL_CONFIG found, not sourcing it" - LOCAL_CONFIG='' -fi +# trim characters that are known to cause problems inside $GRML_NAME; +# for example isolinux does not like '-' inside the directory name +[ -n "$GRML_NAME" ] && export SHORT_GRML_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')" + +# export variables to have them available in fai scripts: +[ -n "$GRML_NAME" ] && export GRML_NAME="$GRML_NAME" +[ -n "$RELEASENAME" ] && export RELEASENAME="$RELEASENAME" +# }}} -# clean/zero grml-live logfile: +# clean/zero grml-live logfile {{{ if [ -n "$ZERO_LOGFILE" ] ; then echo -n > $LOGFILE fi +# }}} -# clean/zero/remove old FAI directory: +# clean/zero/remove old FAI directory {{{ if [ -n "$ZERO_FAI_LOGFILE" ] ; then if [ -d /var/log/fai/"$HOSTNAME" ] ; then rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last)" @@ -236,7 +267,6 @@ if [ -n "$ZERO_FAI_LOGFILE" ] ; then /var/log/fai/"$HOSTNAME"/last-softupdate fi fi - # }}} # ask user whether the setup is ok {{{ @@ -260,9 +290,11 @@ if [ -z "$FORCE" ] ; then [ -n "$TEMPLATE_DIRECTORY" ] && echo " Template files: $TEMPLATE_DIRECTORY" [ -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_OPTIONS" ] && echo " Using SQUASHFS_OPTIONS ${SQUASHFS_OPTIONS}" [ -n "$VERBOSE" ] && echo " Using VERBOSE mode." - [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead od LZMA) compression." [ -n "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation." + [ -n "$BUILD_ONLY" ] && echo " Executing BUILD_ONLY instead of fresh installation or UPDATE." echo echo -n "Is this ok for you? [y/N] " read a @@ -353,22 +385,22 @@ fi # CHROOT_OUTPUT - execute FAI {{{ [ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot" -if [ -n "$UPDATE" ] ; then +if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then FAI_ACTION=softupdate else FAI_ACTION=dirinstall fi -if [ -n "$UPDATE" ] ; then +if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then if ! [ -r "$CHROOT_OUTPUT/etc/grml_version" ] ; then - log "Error: does not look like you have a working chroot. Updating not possible." - eerror "Error: does not look like you have a working chroot. Updating not possible. (Drop -u option?)" + log "Error: does not look like you have a working chroot. Updating/building not possible." + eerror "Error: does not look like you have a working chroot. Updating/building not possible. (Drop -u/-b option?)" eend 1 bailout 20 fi fi -if [ -d "$CHROOT_OUTPUT/bin" -a -z "$UPDATE" ] ; then +if [ -d "$CHROOT_OUTPUT/bin" -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then log "$CHROOT_OUTPUT exists already, skipping stage 'fai dirinstall'" ewarn "$CHROOT_OUTPUT exists already, skipping stage 'fai dirinstall'" ; eend 0 else @@ -380,20 +412,36 @@ else fi log "Executed FAI command line:" - log "fai $VERBOSE -C $GRML_FAI_CONFIG -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS" - fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u "$HOSTNAME" $FAI_ACTION "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE - - log "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]" - echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]" > $CHROOT_OUTPUT/etc/grml_version - chmod 644 $CHROOT_OUTPUT/etc/grml_version + log "BUILD_ONLY=$BUILD_ONLY fai $VERBOSE -C $GRML_FAI_CONFIG -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS" + BUILD_ONLY="$BUILD_ONLY" fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u \ + "$HOSTNAME" $FAI_ACTION "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE + RC="$PIPESTATUS" # notice: bash-only + + if [ "$RC" != 0 ] ; then + log "Error while executing fai [exit code ${RC}]. Exiting." + eerror "Error while executing fai [exit code ${RC}]. Exiting." ; eend 1 + bailout 1 + else + log "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]" + echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]" > $CHROOT_OUTPUT/etc/grml_version + chmod 644 $CHROOT_OUTPUT/etc/grml_version + einfo "Rebuilding initramfs" + # make sure new /etc/grml_version reaches the initramfs: + chroot $CHROOT_OUTPUT update-initramfs -u -t + eend $? + fi # 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/* + if [ -f "$CHROOT_OUTPUT"/etc/grml_fai_release ] ; then + 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: @@ -401,11 +449,11 @@ else CHECKLOG=/var/log/fai/$HOSTNAME/last if [ -r "$CHECKLOG/software.log" ] ; then # 1 errors during executing of commands - # Unable to write mmap - msync (28 No space left on device) - # 'No candidate version found for' [/var/log/fai/current/software.log] grep 'dpkg: error processing' $CHECKLOG/software.log >> $LOGFILE && ERROR=1 grep 'E: Method http has died unexpectedly!' $CHECKLOG/software.log >> $LOGFILE && ERROR=2 grep 'ERROR: chroot' $CHECKLOG/software.log >> $LOGFILE && ERROR=3 + grep 'E: Failed to fetch' $CHECKLOG/software.log >> $LOGFILE && ERROR=4 + grep 'Unable to write mmap - msync (28 No space left on device)' $CHECKLOG/software.log >> $LOGFILE && ERROR=5 fi if [ -r "$CHECKLOG/shell.log" ] ; then @@ -415,7 +463,7 @@ else if [ -n "$ERROR" ] ; then log "There was an error [${ERROR}] during execution of stage 'fai dirinstall' [$(date)]" eerror "There was an error during execution of stage 'fai dirinstall'" - echo " Check out $CHECKLOG for details. [exit ${ERROR}]" + echo " Check out ${CHECKLOG}/ for details. [exit ${ERROR}]" eend 1 bailout 1 else @@ -431,19 +479,24 @@ mkdir -p "$BUILD_OUTPUT" || bailout 6 "Problem with creating $BUILD_OUTPUT for s # i386: if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then - if [ -d "$BUILD_OUTPUT"/boot -a -z "$UPDATE" ] ; then + if [ -d "$BUILD_OUTPUT"/boot -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then log "$BUILD_OUTPUT/boot exists already, skipping stage 'boot'" ewarn "$BUILD_OUTPUT/boot exists already, skipping stage 'boot'" ; eend 0 else # booting stuff: [ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux - cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/isolinux/memtest + [ -d "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}" + + if [ -z "$NO_ADDONS" ] ; then + [ -d "$BUILD_OUTPUT"/boot/addons ] || mkdir -p "$BUILD_OUTPUT"/boot/addons + cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest + fi # if we don't have an initrd we a) can't boot and b) there was an error # during build, so check for the file: INITRD="$(ls $CHROOT_OUTPUT/boot/initrd* 2>/dev/null| grep -v '.bak$' | sort -r | head -1)" if [ -n "$INITRD" ] ; then - cp $INITRD "$BUILD_OUTPUT"/boot/isolinux/initrd.gz + cp $INITRD "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"/initrd.gz find $CHROOT_OUTPUT/boot/ -name initrd\*.bak -exec rm {} \; else log "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" @@ -453,7 +506,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* 2>/dev/null | sort -r | head -1)" if [ -n "$KERNEL_IMAGE" ] ; then - cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/isolinux/linux26 + cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"/linux26 else log "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" eerror "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1 @@ -468,7 +521,10 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then fi cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/ - cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/ + + if [ -z "$NO_ADDONS" ] ; then + cp ${TEMPLATE_DIRECTORY}/boot/addons/* "$BUILD_OUTPUT"/boot/addons/ + fi if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/ @@ -494,11 +550,23 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_OUTPUT"/boot/isolinux/boot.msg sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_OUTPUT"/boot/isolinux/boot.msg + sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg + sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg + sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_OUTPUT"/boot/isolinux/boot-beep.msg sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_OUTPUT"/boot/isolinux/boot-beep.msg sed -i "s/%VERSION%/$VERSION/" "$BUILD_OUTPUT"/boot/grub/menu.lst - sed -i "s/%GRML_NAME%/$GRML_NAME/" "$BUILD_OUTPUT"/boot/grub/menu.lst + sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/grub/menu.lst + + # make sure the squashfs filename is set accordingly: + GRML_NAME_SQUASHFS="$GRML_NAME.squashfs" + sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg + sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg + + GRML_NAME_SQUASHFS="$(cut_string 20 "$GRML_NAME_SQUASHFS")" + GRML_NAME_SQUASHFS="$(extend_string_end 20 "$GRML_NAME_SQUASHFS")" + sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/f4 # autostart for Windows: if [ -d "${TEMPLATE_DIRECTORY}/windows/autostart/" ] ; then @@ -533,7 +601,7 @@ else eerror 'Error: Unsupported ARCH, sorry. Want to support it? Contribute!' ; eend 1 fi -if [ -f "$BUILD_OUTPUT"/live/grml.squashfs -a -z "$UPDATE" ] ; then +if [ -f "$BUILD_OUTPUT"/live/${GRML_NAME}.squashfs -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then log "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ; eend 0 else @@ -541,11 +609,53 @@ else # make sure we don't leave (even an empty) base.tgz: [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz" - # execute squashfs: - log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend" - mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB - log "Finished execution of stage 'squashfs' [$(date)]" - einfo "Finished execution of stage 'squashfs'" ; eend 0 + # make sure mksquashfs can handle the according option: + if [ -n "$SQUASHFS_ZLIB" ] ; then + mksquashfs --help 2>&1 | grep -q -- "$SQUASHFS_ZLIB" || SQUASHFS_ZLIB='' + fi + + if echo "$SQUASHFS_OPTIONS" | grep -q -- "-nolzma" ; then + if ! mksquashfs --help 2>&1 | grep -q -- '-nolzma' ; then + ewarn "mksquashfs does NOT support the nolzma option, just using default zlib mode." + SQUASHFS_OPTIONS="$(echo $SQUASHFS_OPTIONS | sed 's/-nolzma//g')" + eend 0 + fi + fi + + if echo "$SQUASHFS_OPTIONS" | grep -q -- "-lzma" ; then + if ! mksquashfs --help 2>&1 | grep -q -- '-lzma' ; then + ewarn "mksquashfs does NOT support the lzma option, falling back to zlib mode." + SQUASHFS_OPTIONS="$(echo $SQUASHFS_OPTIONS | sed 's/-lzma//g')" + eend 0 + fi + fi + + # support exclusion of files via exclude-file: + if [ -n "$SQUASHFS_EXCLUDES_FILE" -a "$SQUASHFS_EXCLUDES_FILE" ] ; then + SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -ef $SQUASHFS_EXCLUDES_FILE" + fi + + # get rid of unnecessary files when building grml-small for final release: + if echo "$CLASSES" | grep -q GRML_SMALL ; then + SQUASHFS_OPTIONS="$SQUASHFS_OUTPUT -e initrd.img* vmlinuz*" + fi + + SQUASHFS_OUTPUT="$(mktemp -t grml-live.XXXXXX)" + log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB" + if mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs \ + -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB 2>"${SQUASHFS_OUTPUT}" ; 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 + rm -f "${SQUASHFS_OUTPUT}" + else + log "There was an error executing stage 'squashfs' [$(date)]:" + log "$(cat $SQUASHFS_OUTPUT)" + eerror "There was an error executing stage 'squashfs':" ; eend 1 + cat "${SQUASHFS_OUTPUT}" + rm -f "${SQUASHFS_OUTPUT}" + bailout + fi fi # create md5sum file: @@ -563,7 +673,7 @@ elif [ "$BOOT_METHOD" = "grub" ] ; then BOOT_FILE="boot/grub/stage2_eltorito" fi -if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" ] ; then +if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then log "$ISO_OUTPUT exists already, skipping stage 'iso build'" ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0 else @@ -571,7 +681,7 @@ else CURRENT_DIR=$(pwd) if cd "$BUILD_OUTPUT" ; then - log "mkisofs -V grml '$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} ." + log "mkisofs -V 'grml $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} ." mkisofs -V "grml $VERSION" -publisher 'grml-live | grml.org' \ -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table \ -b $BOOT_FILE \