X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=207ccb08ac755bda9f2878cfc14f8585ba5d180b;hp=ce61ca7338a54cf1a3fbca02e3481198ab01fc9e;hb=78c05688e3568ba363624bb6100540391f092862;hpb=e265e3093a98d723d40b36dde1aba26146aa301f diff --git a/grml-live b/grml-live index ce61ca7..207ccb0 100755 --- a/grml-live +++ b/grml-live @@ -23,7 +23,7 @@ fi set -e # global variables -GRML_LIVE_VERSION='0.9.21' +GRML_LIVE_VERSION='0.9.22' PN="$(basename $0)" CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -47,6 +47,9 @@ Usage: $PN [options, see as follows] -g ] set the grml flavour name -h display short usage information and exit -i name of ISO + -I directory which provides files that should become + part of the chroot/ISO + -n skip generation of ISO -o main output directory of the build process -q skip mksquashfs -r &2 @@ -207,7 +211,7 @@ fi # }}} # command line parsing {{{ -while getopts "a:C:c:g:i:o:r:s:t:v:bBFuqVz" opt; do +while getopts "a:C:c:g:i:I:o:r:s:t:v:bBFnquVz" opt; do case "$opt" in a) ARCH="$OPTARG" ;; b) BUILD_ONLY=1 ;; @@ -216,6 +220,8 @@ while getopts "a:C:c:g:i:o:r:s:t:v:bBFuqVz" opt; do C) CONFIG="$OPTARG" ;; g) GRML_NAME="$OPTARG" ;; i) ISO_NAME="$OPTARG" ;; + I) CHROOT_INSTALL="$OPTARG" ;; + n) SKIP_MKISOFS=1 ;; o) OUTPUT="$OPTARG" ;; q) SKIP_MKSQUASHFS=1 ;; r) RELEASENAME="$OPTARG" ;; @@ -233,20 +239,28 @@ shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter # }}} # assume sane defaults (if not set already) {{{ -[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)" -[ -n "$BOOT_METHOD" ] || BOOT_METHOD='isolinux' -[ -n "$CLASSES" ] || CLASSES='GRML,I386' -[ -n "$DISTRI_INFO" ] || DISTRI_INFO='Grml - Live Linux for system administrators ' -[ -n "$DISTRI_NAME" ] || DISTRI_NAME="grml" -[ -n "$DISTRI_SPLASH" ] || DISTRI_SPLASH='grml.png' -[ -n "$GRML_FAI_CONFIG" ] || GRML_FAI_CONFIG='/etc/grml/fai' -[ -n "$GRML_NAME" ] || GRML_NAME='grml' -[ -n "$HOSTNAME" ] || HOSTNAME='grml' -[ -n "$NFSROOT_CONF" ] || NFSROOT_CONF='/etc/grml/fai/make-fai-nfsroot.conf' -[ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks' -[ -n "$SUITE" ] || SUITE='stable' -[ -n "$USERNAME" ] || USERNAME='grml' -[ -n "$VERSION" ] || VERSION='0.0.1' +[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)" +[ -n "$BOOT_METHOD" ] || BOOT_METHOD='isolinux' +[ -n "$BUILD_OUTPUT" ] || BUILD_OUTPUT="$OUTPUT/grml_cd" +[ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot" +[ -n "$CLASSES" ] || CLASSES="GRMLBASE,GRML_MEDIUM,I386" +[ -n "$DISTRI_INFO" ] || DISTRI_INFO='Grml - Live Linux for system administrators ' +[ -n "$DISTRI_NAME" ] || DISTRI_NAME="grml" +[ -n "$DISTRI_SPLASH" ] || DISTRI_SPLASH='grml.png' +[ -n "$FORCE_ISO_REBUILD" ] || FORCE_ISO_REBUILD="false" +[ -n "$GRML_FAI_CONFIG" ] || GRML_FAI_CONFIG='/etc/grml/fai' +[ -n "$GRML_NAME" ] || GRML_NAME='grml' +[ -n "$HOSTNAME" ] || HOSTNAME='grml' +[ -n "$ISO_OUTPUT" ] || ISO_OUTPUT="$OUTPUT/grml_isos" +[ -n "$NFSROOT_CONF" ] || NFSROOT_CONF='/etc/grml/fai/make-fai-nfsroot.conf' +[ -n "$OUTPUT" ] || OUTPUT='/grml/grml-live' +[ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks' +[ -n "$SQUASHFS_EXCLUDES_FILE " ] || SQUASHFS_EXCLUDES_FILE='/etc/grml/fai/squashfs-excludes' +[ -n "$SUITE" ] || SUITE='stable' +[ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates' +[ -n "$USERNAME" ] || USERNAME='grml' +[ -n "$VERSION" ] || VERSION='0.0.1' +[ -n "$WINDOWS_BINARIES" ] || WINDOWS_BINARIES='http://the.earth.li/~sgtatham/putty/latest/x86/' # }}} # some misc checks before executing FAI {{{ @@ -307,6 +321,7 @@ if [ -z "$FORCE" ] ; then [ -n "$ARCH" ] && echo " Architecture: $ARCH" [ -n "$BOOT_METHOD" ] && echo " Boot method: $BOOT_METHOD" [ -n "$TEMPLATE_DIRECTORY" ] && echo " Template files: $TEMPLATE_DIRECTORY" + [ -n "$CHROOT_INSTALL" ] && echo " Install files from directory to chroot: $CHROOT_INSTALL" [ -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." @@ -314,6 +329,7 @@ if [ -z "$FORCE" ] ; then [ -n "$VERBOSE" ] && echo " Using VERBOSE mode." [ -n "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation." [ -n "$SKIP_MKSQUASHFS" ] && echo " Skipping creation of SQUASHFS file." + [ -n "$SKIP_MKISOFS" ] && echo " Skipping creation of ISO file." [ -n "$BUILD_ONLY" ] && echo " Executing BUILD_ONLY instead of fresh installation or UPDATE." [ -n "$BUILD_DIRTY" ] && echo " Executing BUILD_DIRTY to leave chroot untouched." echo @@ -327,8 +343,8 @@ fi if [ -n "$CONFIG" ] ; then if ! [ -f "$CONFIG" ] ; then - log "Sorry, $CONFIG could not be read. Exiting. [$(date)]" - eerror "Sorry, $CONFIG could not be read. Exiting." + log "Error: $CONFIG could not be read. Exiting. [$(date)]" + eerror "Error: $CONFIG could not be read. Exiting." ; eend 1 bailout 1 else log "Sourcing $CONFIG" @@ -348,8 +364,8 @@ einfo "Logging actions to logfile $LOGFILE" # on-the-fly configuration {{{ if [ -n "$MIRROR_DIRECTORY" ] ; then if ! [ -d "$MIRROR_DIRECTORY/debian" ] ; then - log "Sorry, $MIRROR_DIRECTORY/debian does not seem to exist. Exiting. [$(date)]" - eerror "Sorry, $MIRROR_DIRECTORY/debian does not seem to exist. Exiting." + log "Error: $MIRROR_DIRECTORY/debian does not seem to exist. Exiting. [$(date)]" + eerror "Error: $MIRROR_DIRECTORY/debian does not seem to exist. Exiting." ; eend 1 bailout 1 fi cat > "$SOURCES_LIST_FILE" << EOF @@ -420,14 +436,18 @@ done # architecture (option), otherwise installation of kernel will fail if echo $CLASSES | grep -qi i386 ; then if ! [[ "$ARCH" == "i386" ]] ; then - eerror "You specified the I386 class but are trying to build something else (AMD64?)." - eerror "-> Either invoke grml-live with '-i i386' or adjust the architecture class. Exiting." + log "Error: You specified the I386 class but are trying to build something else (AMD64?)." + eerror "Error: You specified the I386 class but are trying to build something else (AMD64?)." + eerror "Tip: Either invoke grml-live with '-i i386' or adjust the architecture class. Exiting." + eend 1 bailout fi elif echo $CLASSES | grep -qi amd64 ; then if ! [[ "$ARCH" == "amd64" ]] ; then - eerror "You specified the AMD64 class but are trying to build something else (I386?)." - eerror "-> Either invoke grml-live with '-i amd64' or adjust the architecture class. Exiting." + log "Error: You specified the AMD64 class but are trying to build something else (I386?)." + eerror "Error: You specified the AMD64 class but are trying to build something else (I386?)." + eerror "Tip: Either invoke grml-live with '-i amd64' or adjust the architecture class. Exiting." + eend 1 bailout fi fi @@ -441,7 +461,8 @@ fi # CHROOT_OUTPUT - execute FAI {{{ if [ -n "$BUILD_DIRTY" ]; then - einfo "Skipping FAI" ; eend 0 + log "Skipping stage 'fai' as requested via option -B" + ewarn "Skipping stage 'fai' as requested via option -B" ; eend 0 else [ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot" @@ -458,8 +479,8 @@ else fi 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/building not possible." + if ! [ -r "$CHROOT_OUTPUT/etc/debian_version" ] ; then + 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 @@ -467,8 +488,8 @@ else fi 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 + log "Skiping stage 'fai dirinstall' as $CHROOT_OUTPUT exists already." + ewarn "Skiping stage 'fai dirinstall' as $CHROOT_OUTPUT exists already." ; eend 0 else mkdir -p "$CHROOT_OUTPUT" || bailout 5 "Problem with creating $CHROOT_OUTPUT for FAI" @@ -483,9 +504,11 @@ else "$HOSTNAME" $FAI_ACTION "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE RC="$PIPESTATUS" # notice: bash-only + FORCE_ISO_REBUILD=true + if [ "$RC" != 0 ] ; then - log "Error while executing fai [exit code ${RC}]. Exiting." - eerror "Error while executing fai [exit code ${RC}]. Exiting." ; eend 1 + log "Error: critical error while executing fai [exit code ${RC}]. Exiting." + eerror "Error: critical 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]" @@ -527,9 +550,9 @@ else fi 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}]" + log "Error: there was a critical error [${ERROR}] during execution of stage 'fai dirinstall' [$(date)]" + eerror "Error: there was a critical error during execution of stage 'fai dirinstall'" + eerror "Note: check out ${CHECKLOG}/ for details. [exit ${ERROR}]" eend 1 bailout 1 else @@ -537,6 +560,9 @@ else einfo "Finished execution of stage 'fai dirinstall'" fi + einfo "Find FAI build logs at $(readlink -f /var/log/fai/$HOSTNAME/last)." + log "Find FAI build logs at $(readlink -f /var/log/fai/$HOSTNAME/last)." + eend 0 fi fi # BUILD_DIRTY? # }}} @@ -548,8 +574,8 @@ 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/isolinux -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then - log "$BUILD_OUTPUT/boot/isolinux exists already, skipping stage 'boot'" - ewarn "$BUILD_OUTPUT/boot/isolinux exists already, skipping stage 'boot'" ; eend 0 + log "Skipping stage 'boot' as $BUILD_OUTPUT/boot/isolinux exists already." + ewarn "Skipping stage 'boot' as $BUILD_OUTPUT/boot/isolinux exists already." ; eend 0 else # booting stuff: [ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux @@ -557,7 +583,17 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then 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 + if [ -r "$TEMPLATE_DIRECTORY"/boot/addons/memtest ] ; then + log "Installing $TEMPLATE_DIRECTORY/boot/addons/memtest" + cp "$TEMPLATE_DIRECTORY"/boot/addons/memtest "$BUILD_OUTPUT"/boot/addons/memtest + elif [ -r /boot/memtest86+.bin ] ; then + log "Installing /boot/memtest86+.bin" + cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest + else + ewarn "No memtest binary found, skipping." + log "No memtest binary found, skipping." + eend 0 + fi fi # if we don't have an initrd we a) can't boot and b) there was an error @@ -567,8 +603,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then 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" - eerror "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1 + log "Error: No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" + eerror "Error: No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1 bailout 10 fi @@ -576,21 +612,25 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then if [ -n "$KERNEL_IMAGE" ] ; then 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 + log "Error: No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" + eerror "Error: No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1 bailout 11 fi [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates' if ! [ -d "${TEMPLATE_DIRECTORY}"/boot ] ; then - log "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting." - eerror "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting." ; eend 1 + log "Error: ${TEMPLATE_DIRECTORY}/boot does not exist. Exiting." + eerror "Error: ${TEMPLATE_DIRECTORY}/boot does not exist. Exiting." ; eend 1 bailout 8 fi cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/ - if [ -z "$NO_ADDONS" ] ; then + if [ -n "$NO_ADDONS" ] ; then + log "Skipping installation boot addons requested via \$NO_ADDONS." + einfo "Skipping installation boot addons requested via \$NO_ADDONS." + eend 0 + else if ! [ -d /usr/share/grml-live/templates/boot/addons/bsd4grml ] ; then ewarn "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)" ; eend 0 else @@ -613,8 +653,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then cp ${TEMPLATE_DIRECTORY}/boot/grub/* "$BUILD_OUTPUT"/boot/grub/ if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then - log "${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting." - eerror "${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting." ; eend 1 + log "Error: ${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting." + eerror "Error: ${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting." ; eend 1 bailout 9 fi @@ -644,8 +684,16 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then sed -i "s/%VERSION%/$VERSION/" "$BUILD_OUTPUT"/boot/grub/grub.cfg sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/grub/grub.cfg + if [ -r "${BUILD_OUTPUT}/boot/isolinux/${DISTRI_NAME}.cfg" ] ; then + sed -i "s/%VERSION%/$VERSION/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg + sed -i "s/%GRML_LONG_NAME%/$DISTRI_NAME/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg + sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg + sed -i "s/%ARCH%/$ARCH/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg + fi + sed -i "s/%VERSION%/$VERSION/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg - sed -i "s/%GRML_NAME%/$GRML_NAME/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg + sed -i "s/%GRML_LONG_NAME%/$GRML_NAME/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg + sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg sed -i "s/%ARCH%/$ARCH/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg sed -i "s/%DISTRI_INFO%/$DISTRI_INFO/" "$BUILD_OUTPUT"/boot/isolinux/vesamenu.cfg @@ -662,7 +710,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/f4 sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/f5 - if ! [ -r "${BUILD_OUTPUT}/boot/isolinux/${DISTRI_NAME}.cfg" ] ; then + if ! [ -r "${BUILD_OUTPUT}/boot/isolinux/${DISTRI_NAME}.cfg" ] || [ "$DISTRI_NAME" = "grml" ] ; then log "including grml.cfg in ${BUILD_OUTPUT}/boot/isolinux/distri.cfg" echo "include grml.cfg" > "${BUILD_OUTPUT}/boot/isolinux/distri.cfg" [ -n "$NO_ADDONS" ] || echo "include addons.cfg" >> "${BUILD_OUTPUT}/boot/isolinux/distri.cfg" @@ -671,7 +719,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then einfo "File ${BUILD_OUTPUT}/boot/isolinux/${DISTRI_NAME}.cfg found, using it." if grep -q "^include ${DISTRI_NAME}.cfg" "${BUILD_OUTPUT}/boot/isolinux/distri.cfg" ; then log "include for ${DISTRI_NAME}.cfg already present, nothing to do." + eindent einfo "include for ${DISTRI_NAME}.cfg already present, nothing to do." + eoutdent eend $? else log "including ${DISTRI_NAME}.cfg in ${BUILD_OUTPUT}/boot/isolinux/distri.cfg" @@ -704,17 +754,17 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then fi # jump back to grub from bsd4grml: + if [ -e "$BUILD_OUTPUT"/boot/grub/stage2 ]; then + GRUB_LEGACY=stage2 + else + GRUB_LEGACY=stage2_eltorito + fi if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then if [ -e "$BUILD_OUTPUT"/boot/grub/core.img ]; then GRUB_VERSION=2 else GRUB_VERSION=1 fi - if [ -e "$BUILD_OUTPUT"/boot/grub/stage2 ]; then - GRUB_LEGACY=stage2 - else - GRUB_LEGACY=stage2_eltorito - fi # why not ed(1)? for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \ @@ -722,6 +772,15 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then sed -i -e "s!%GRUB_VERSION%!$GRUB_VERSION!g" \ -e "s!%GRUB_LEGACY%!$GRUB_LEGACY!g" "$file" done + + sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 + fi + if [ -e "$BUILD_OUTPUT"/boot/grub/$GRUB_LEGACY ]; then + sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/menu.lst + sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/grub.cfg + else + sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/menu.lst + sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/grub.cfg fi # autostart for Windows: @@ -730,10 +789,14 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then fi # windows-binaries: - if [ -n "$WINDOWS_BINARIES" ] ; then + if [ -n "$NO_WINDOWS_BINARIES" ] ; then + log "Skipping download of windows binaries as requested via \$NO_WINDOWS_BINARIES." + einfo "Skipping download of windows binaries as requested via \$NO_WINDOWS_BINARIES." + eend 0 + else if [ -f "$BUILD_OUTPUT"/windows/putty.exe ] ; then - log "$BUILD_OUTPUT/windows exists already, skipping stage 'WINDOWS_BINARIES'" - ewarn "$BUILD_OUTPUT/windows exists already, skipping stage 'WINDOWS_BINARIES'" ; eend 0 + log "Skipping stage 'WINDOWS_BINARIES' as $BUILD_OUTPUT/windows exists already." + ewarn "Skipping stage 'WINDOWS_BINARIES' as $BUILD_OUTPUT/windows exists already." ; eend 0 else if ! [ -d "$BUILD_OUTPUT"/windows ] ; then mkdir "$BUILD_OUTPUT"/windows @@ -744,46 +807,111 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then done ) fi fi - log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]" - einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0 + log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]" + einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0 fi + + FORCE_ISO_REBUILD=true einfo "Finished execution of stage 'boot'" ; eend 0 fi -# ppc: -elif [ "$ARCH" = powerpc ] ; then - ewarn 'Warning: formorer, it is your turn. :)'>&2 -# unsuported: else + log 'Error: Unsupported ARCH, sorry. Want to support it? Contribute!' eerror 'Error: Unsupported ARCH, sorry. Want to support it? Contribute!' ; eend 1 + bailout +fi + +# support installation of local files into the chroot/ISO +if [ -n "$CHROOT_INSTALL" ] ; then + if ! [ -d "$CHROOT_INSTALL" ] ; then + log "Configuration variable \$CHROOT_INSTALL is set but not a directory; ignoring" + ewarn "Configuration variable \$CHROOT_INSTALL is set but not a directory; ignoring" + else + log "Copying local files to chroot as requested via \$CHROOT_INSTALL" + einfo "Copying local files to chroot as requested via \$CHROOT_INSTALL" + rsync -avz --inplace "$CHROOT_INSTALL"/ "$CHROOT_OUTPUT/" + eend $? + einfo "Make sure to run squashfs stage, otherwise your local files won't be part of the ISO." + FORCE_ISO_REBUILD=true + fi fi if [ -f "$BUILD_OUTPUT"/live/${GRML_NAME}.squashfs -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then - log "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" - ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ; eend 0 + log "Skipping stage 'squashfs' as $BUILD_OUTPUT/live exists already." + ewarn "Skipping stage 'squashfs' as $BUILD_OUTPUT/live exists already." ; eend 0 elif [ -n "$SKIP_MKSQUASHFS" ] ; then - log "Skipping stage 'squashfs' as requested via option -q" + log "Skipping stage 'squashfs' as requested via option -q" ewarn "Skipping stage 'squashfs' as requested via option -q" ; eend 0 else [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live # make sure we don't leave (even an empty) base.tgz: [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz" + # $SQUASHFS_BINARY is specified in the configuration: + if [ -n "$SQUASHFS_BINARY" ] ; then + if ! which "$SQUASHFS_BINARY" >/dev/null 2>&1 ; then + log "Error: specified mksquashfs binary ($SQUASHFS_BINARY) not found. Exiting." + eerror "Error: specified mksquashfs binary ($SQUASHFS_BINARY) not found. Exiting." ; eend 1 + bailout + fi + else # no $SQUASHFS_BINARY configured, let's find the according binary: + # Note: this is ALL for backward compability and yes: it's serious PITA. + # We'll definitely drop this once people build >2.6.28-grml* only and + # the squashfs-tools vs. squashfs-lzma-tools + zlib vs. lzma situation + # is settling... + + # assume the safe default if mksquashfs-lzma isn't present: + if ! which mksquashfs-lzma >/dev/null 2>&1 ; then + SQUASHFS_BINARY='mksquashfs' + else # mksquashfs-lzma is available since squashfs-lzma-tools 4.0: + # if the user wants to use zlib then don't use mksquashfs-lzma: + if echo "$SQUASHFS_OPTIONS" | grep -q -- "-nolzma" || [ -n "$SQUASHFS_ZLIB" ] ; then + SQUASHFS_BINARY='mksquashfs' + else # neither -nolzma nor -z and mksquashfs-lzma is available: + SQUASHFS_BINARY='mksquashfs-lzma' + + # backwards compability: someone has squashfs-lzma-tools >=4 installed but + # 1) doesn't use -nolzma in $SQUASHFS_OPTIONS or the grml-live's -z option *and* + # 2) builds against kernel version <=2.6.28-grml[64] + if ls $CHROOT_OUTPUT/boot/vmlinuz* >/dev/null 2>&1 ; then + KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* 2>/dev/null | sort -r | head -1)" + + case $KERNEL_IMAGE in + *vmlinuz-2.6.28-grml*|*vmlinuz-2.6.26-grml*|*vmlinuz-2.6.23-grml*) + log "You seem to be building a system with squashfs file format 3 using squashfs-lzma-tools >=4." + ewarn "You seem to be building a system with squashfs file format 3 using squashfs-lzma-tools >=4." + ewarn "|-> Consider installing squashfs-lzma-tools 3.3-1 for support of file format version 3." + ewarn "|-> Trying the mksquashfs binary instead of mksquashfs-lzma (though this might fail)." + ewarn "\`-> Visit http://grml.org/grml-live/#current_state for further details if building fails." + eend 0 + SQUASHFS_BINARY='mksquashfs' + ;; + esac + fi + fi + + fi + fi + # make sure mksquashfs can handle the according option: if [ -n "$SQUASHFS_ZLIB" ] ; then - mksquashfs --help 2>&1 | grep -q -- "$SQUASHFS_ZLIB" || SQUASHFS_ZLIB='' + $SQUASHFS_BINARY --help 2>&1 | grep -q -- "$SQUASHFS_ZLIB" || SQUASHFS_ZLIB='' fi + # make sure to drop the -nolzma option if it's not available: 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." + if ! $SQUASHFS_BINARY --help 2>&1 | grep -q -- '-nolzma' ; then + log "$SQUASHFS_BINARY does NOT support the nolzma option, dropping it and using default mode." + ewarn "$SQUASHFS_BINARY does NOT support the nolzma option, dropping it and using default mode." SQUASHFS_OPTIONS="$(echo $SQUASHFS_OPTIONS | sed 's/-nolzma//g')" eend 0 fi fi + # make sure to drop the -lzma option if it's not available: 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." + if ! $SQUASHFS_BINARY --help 2>&1 | grep -q -- '-lzma' ; then + log "$SQUASHFS_BINARY does NOT support the lzma option, dropping it and using default mode." + ewarn "$SQUASHFS_BINARY does NOT support the lzma option, dropping it and using default mode." SQUASHFS_OPTIONS="$(echo $SQUASHFS_OPTIONS | sed 's/-lzma//g')" eend 0 fi @@ -796,25 +924,43 @@ else # 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*" + SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -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 + # check whether we have the according binary available: + if ! which $SQUASHFS_BINARY >/dev/null 2>&1 ; then + log "Error: mksquashfs binary (${SQUASHFS_BINARY}) could not be found. Exiting." + eerror "Error: mksquashfs binary (${SQUASHFS_BINARY}) could not be found. Exiting." + eerror "|-> Make sure to install either squashfs-tools and/or squashfs-lzma-tools." + eerror "\`-> Visit http://grml.org/grml-live/#current_state for further details." + eend 1 + package + bailout + fi + + SQUASHFS_STDERR="$(mktemp -t grml-live.XXXXXX)" + + [ -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" + + if $SQUASHFS_BINARY $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs \ + -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB 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 - 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}" + log "Error: there was a critical error executing stage 'squashfs' [$(date)]:" + log "$(cat $SQUASHFS_STDERR)" + eerror "Error: there was a critical error executing stage 'squashfs':" ; eend 1 + cat "${SQUASHFS_STDERR}" bailout fi + + FORCE_ISO_REBUILD=true fi # create md5sum file: @@ -832,20 +978,28 @@ elif [ "$BOOT_METHOD" = "grub" ] ; then BOOT_FILE="boot/grub/stage2_eltorito" fi -if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then - log "$ISO_OUTPUT exists already, skipping stage 'iso build'" - ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0 +if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" -a "$FORCE_ISO_REBUILD" = "false" ] ; then + log "Skipping stage 'iso build' as $ISO_OUTPUT/${ISO_NAME} exists already." + ewarn "Skipping stage 'iso build' as $ISO_OUTPUT/${ISO_NAME} exists already." ; eend 0 +elif [ -n "$SKIP_MKISOFS" ] ; then + log "Skipping stage 'iso build' as requested via option -n" + ewarn "Skipping stage 'iso build' as requested via option -n" ; eend 0 else mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'" + if $FORCE_ISO_REBUILD ; then + log "Forcing rebuild of ISO because files on ISO have been modified." + einfo "Forcing rebuild of ISO because files on ISO have been modified." + fi + # support mkisofs as well as genisoimage if which mkisofs >/dev/null 2>&1; then MKISOFS='mkisofs' elif which genisoimage >/dev/null 2>&1; then MKISOFS='genisoimage' else - log "Sorry, neither mkisofs nor genisoimage available - can not create ISO." - eerror "Sorry, neither mkisofs nor genisoimage available - can not create ISO." ; eend 1 + log "Error: neither mkisofs nor genisoimage available - can not create ISO." + eerror "Error: neither mkisofs nor genisoimage available - can not create ISO." ; eend 1 bailout fi @@ -866,7 +1020,7 @@ else # support disabling hybrid ISO image if [ "$HYBRID_METHOD" = "disable" ] ; then\ - log "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable" + log "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable" einfo "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable" eend 0 # use isohybrid only on request @@ -912,11 +1066,11 @@ else fi if [ "$RC" = 0 ] ; then - log "Finished execution of stage 'iso build' [$(date)]" + log "Finished execution of stage 'iso build' [$(date)]" einfo "Finished execution of stage 'iso build'" ; eend 0 else - log "There was an error ($RC) executing stage 'iso build' [$(date)]" - eerror "There was an error executing stage 'iso build'" ; eend 1 + log "Error: there was a critical error ($RC) executing stage 'iso build' [$(date)]" + eerror "Error: there was a critical error executing stage 'iso build'" ; eend 1 bailout $RC fi fi