X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=5e081bab90036b4055b3f8db3ed59484cd930973;hp=bfc853bda94a236e4283af3553cc51d7695424db;hb=82345f34a6fd3441ce4c65483c056e078370d6f9;hpb=5f8bc68065c2395c347271320ce654026332468c diff --git a/grml-live b/grml-live index bfc853b..5e081ba 100755 --- a/grml-live +++ b/grml-live @@ -1,7 +1,9 @@ #!/bin/bash # Filename: grml-live # Purpose: build process script for generating a (grml based) Linux Live-ISO -# Authors: grml-team (grml.org), (c) Michael Prokop +# Authors: grml-team (grml.org), +# (c) Michael Prokop , +# (c) Thorsten Glaser # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. ################################################################################ @@ -11,13 +13,21 @@ export LANG=C export LC_ALL=C +# define function getfilesize before "set -e" +if stat --help >/dev/null 2>&1; then + getfilesize='stat -c %s' # GNU stat +else + getfilesize='stat -f %z' # BSD stat +fi + # exit on any error: set -e -GRML_LIVE_VERSION='0.9.6' +GRML_LIVE_VERSION='0.9.18' PN="$(basename $0)" CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" +SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list' # usage information {{{ usage() @@ -29,6 +39,7 @@ Usage: $PN [options, see as follows] -a architecture; available values: i386 and amd64 -b build the ISO without updating the chroot via FAI + -B build the ISO without touching the chroot (skips cleanup) -c classes to be used for building the ISO via FAI -C configuration file for grml-live -F force execution without prompting @@ -37,8 +48,8 @@ Usage: $PN [options, see as follows] -i name of ISO -o main output directory of the build process -q skip mksquashfs - -r release name - -s Debian suite; values: etch, lenny, sid + -r Debian suite; values: etch, lenny, squeeze, sid -t place of the templates -u update existing chroot instead of rebuilding it from scratch -v specify version number of the release @@ -94,6 +105,7 @@ VERBOSE='' FORCE='' UPDATE='' BUILD_ONLY='' +BUILD_DIRTY='' HOSTNAME='' if [ -r /etc/grml/lsb-functions ] ; then @@ -209,10 +221,11 @@ fi # }}} # command line parsing {{{ -while getopts "a:C:c:g:i:o:r:s:t:v:bFuqVz" opt; do +while getopts "a:C:c:g:i:o:r:s:t:v:bBFuqVz" opt; do case "$opt" in a) ARCH="$OPTARG" ;; b) BUILD_ONLY=1 ;; + B) BUILD_DIRTY=1 ;; c) CLASSES="$OPTARG" ;; C) CONFIG="$OPTARG" ;; g) GRML_NAME="$OPTARG" ;; @@ -277,27 +290,28 @@ if [ -z "$FORCE" ] ; then echo "${PN} [${GRML_LIVE_VERSION}]: check your configuration (or use -F to force execution):" echo echo " FAI classes: $CLASSES" - [ -r "$LOCAL_CONFIG" ] && echo " local config: /etc/grml/grml-live.local" - [ -n "$CONFIG" ] && echo " configuration: $CONFIG" + [ -r "$LOCAL_CONFIG" ] && echo " local config: /etc/grml/grml-live.local" + [ -n "$CONFIG" ] && echo " configuration: $CONFIG" echo " main directory: $OUTPUT" - [ -n "$CHROOT_OUTPUT" ] && echo " chroot target: $CHROOT_OUTPUT" - [ -n "$BUILD_OUTPUT" ] && echo " build target: $BUILD_OUTPUT" - [ -n "$ISO_OUTPUT" ] && echo " ISO target: $ISO_OUTPUT" - [ -n "$GRML_NAME" ] && echo " grml name: $GRML_NAME" - [ -n "$RELEASENAME" ] && echo " release name: $RELEASENAME" - [ -n "$VERSION" ] && echo " grml version: $VERSION" - [ -n "$SUITE" ] && echo " Debian suite: $SUITE" - [ -n "$ARCH" ] && echo " Architecture: $ARCH" - [ -n "$BOOT_METHOD" ] && echo " Boot method: $BOOT_METHOD" + [ -n "$CHROOT_OUTPUT" ] && echo " chroot target: $CHROOT_OUTPUT" + [ -n "$BUILD_OUTPUT" ] && echo " build target: $BUILD_OUTPUT" + [ -n "$ISO_OUTPUT" ] && echo " ISO target: $ISO_OUTPUT" + [ -n "$GRML_NAME" ] && echo " grml name: $GRML_NAME" + [ -n "$RELEASENAME" ] && echo " release name: $RELEASENAME" + [ -n "$VERSION" ] && echo " grml version: $VERSION" + [ -n "$SUITE" ] && echo " Debian suite: $SUITE" + [ -n "$ARCH" ] && echo " Architecture: $ARCH" + [ -n "$BOOT_METHOD" ] && echo " Boot method: $BOOT_METHOD" [ -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 "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation." - [ -n "$SKIP_MKSQUASHFS" ] && echo " Skipping creation of SQUASHFS file." - [ -n "$BUILD_ONLY" ] && echo " Executing BUILD_ONLY instead of fresh installation or UPDATE." + [ -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 "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation." + [ -n "$SKIP_MKSQUASHFS" ] && echo " Skipping creation of SQUASHFS 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 echo -n "Is this ok for you? [y/N] " read a @@ -334,146 +348,167 @@ if [ -n "$MIRROR_DIRECTORY" ] ; then eerror "Sorry, $MIRROR_DIRECTORY/debian does not seem to exist. Exiting." bailout 1 fi - echo "$MIRROR_SOURCES" > /etc/grml/fai/apt/sources.list + cat > "$SOURCES_LIST_FILE" << EOF +# NOTE: This file is *NOT* meant for manual customisation! This file is +# modified by grml-live and any changes might be overriden. +# You might consider using GRML_LIVE_SOURCES in /etc/grml/grml-live.conf* +# and using /etc/grml/fai/files/etc/apt instead!' +EOF + echo "$MIRROR_SOURCES" >> "$SOURCES_LIST_FILE" if [ -n "$GRML_LIVE_SOURCES" ] ; then - echo "$GRML_LIVE_SOURCES" >> /etc/grml/fai/apt/sources.list + echo "$GRML_LIVE_SOURCES" >> "$SOURCES_LIST_FILE" fi elif [ -n "$GRML_LIVE_SOURCES" ] ; then - echo "$GRML_LIVE_SOURCES" > /etc/grml/fai/apt/sources.list + cat > "$SOURCES_LIST_FILE" << EOF +# NOTE: This file is *NOT* meant for manual customisation! This file is +# modified by grml-live and any changes might be overriden. +# You might consider using GRML_LIVE_SOURCES in /etc/grml/grml-live.conf* +# and using /etc/grml/fai/files/etc/apt instead!' +EOF + echo "$GRML_LIVE_SOURCES" >> "$SOURCES_LIST_FILE" fi if [ -n "$FAI_DEBOOTSTRAP" ] ; then - sed -i "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$FAI_DEBOOTSTRAP\"#" $NFSROOT_CONF + sed "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$FAI_DEBOOTSTRAP\"#" "$NFSROOT_CONF" | sponge "$NFSROOT_CONF" fi # does this suck? YES! if [ -n "$SUITE" ] ; then + # /usr/share/debootstrap/scripts/unstable does not exist, instead use 'sid': + case $SUITE in + unstable) SUITE='sid' ;; + esac + + DIST=" etch\| stable\| lenny\| squeeze\| 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 - sed -i "s/SUITE=.*/SUITE=\"$SUITE\"/" $LIVE_CONF - DIST="\|\ etch\ \|\ stable\ \|\ lenny\ \|\ testing\ \|\ sid\ \|\ unstable\ " - sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" $file + sed "s/^SUITE=.*/SUITE=\"$SUITE\"/" $file | sponge $file + sed "s/\(^deb .\+\)\([ \t]*\)\($DIST\)\([ \t]*\)\(main \)/\1 \2$SUITE\4\5/" "$file" | sponge "$file" fi done - sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list # notice: activate grml-live pool only if we are building against unstable: - if grep -qe unstable -qe sid /etc/grml/fai/apt/sources.list ; then - grep -q 'grml-live.*main' /etc/grml/fai/apt/sources.list || \ - grep grml-stable /etc/grml/fai/apt/sources.list | \ - sed 's/grml-stable/grml-live/' >> /etc/grml/fai/apt/sources.list + if grep -qe unstable -qe 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" else - grep -q 'grml-live.*main' /etc/grml/fai/apt/sources.list && \ - sed -i 's/.*grml-live.*/# removed grml-live repository/' /etc/grml/fai/apt/sources.list + grep -q 'grml-live.*main' "$SOURCES_LIST_FILE" && \ + sed 's/.*grml-live.*/# removed grml-live repository/' "$SOURCES_LIST_FILE" | sponge "$SOURCES_LIST_FILE" fi - for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do + for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" "$NFSROOT_CONF" ; do if [ -n "$file" ] ; then - sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" "$file" + sed "s|^FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" "$file" | sponge "$file" fi done - sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $NFSROOT_CONF fi # set $ARCH [ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)" -if grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' $NFSROOT_CONF ; then - sed -i "s/--arch [a-z0-9]* /--arch $ARCH /" $NFSROOT_CONF +if grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' "$NFSROOT_CONF" ; then + sed "s/--arch [a-z0-9]* /--arch $ARCH /" "$NFSROOT_CONF" | sponge "$NFSROOT_CONF" else - sed -i "s|FAI_DEBOOTSTRAP_OPTS=\"\(.*\)|FAI_DEBOOTSTRAP_OPTS=\"--arch $ARCH \1|" $NFSROOT_CONF + sed "s|^FAI_DEBOOTSTRAP_OPTS=\"\(.*\)|FAI_DEBOOTSTRAP_OPTS=\"--arch $ARCH \1|" "$NFSROOT_CONF" | sponge "$NFSROOT_CONF" fi # }}} # CHROOT_OUTPUT - execute FAI {{{ -[ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot" - -if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then - FAI_ACTION=softupdate +if [ -n "$BUILD_DIRTY" ]; then + einfo "Skipping FAI" ; eend 0 else - FAI_ACTION=dirinstall -fi + [ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot" -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." - eerror "Error: does not look like you have a working chroot. Updating/building not possible. (Drop -u/-b option?)" - eend 1 - bailout 20 + if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then + FAI_ACTION=softupdate + else + FAI_ACTION=dirinstall fi -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 -else - mkdir -p "$CHROOT_OUTPUT" || bailout 5 "Problem with creating $CHROOT_OUTPUT for FAI" - if [ -n "${MIRROR_DIRECTORY}" ] ; then - mkdir -p "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}" - mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}" + 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." + 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 - log "Executed FAI command line:" - 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 + 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 - 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 + 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/* - fi + if [ -n "${MIRROR_DIRECTORY}" ] ; then + mkdir -p "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}" + mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}" + 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: - ERROR='' - CHECKLOG=/var/log/fai/$HOSTNAME/last - if [ -r "$CHECKLOG/software.log" ] ; then - # 1 errors during executing of commands - 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 + log "Executed FAI command line:" + 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 [ -r "$CHECKLOG/shell.log" ] ; then - grep 'FAILED with exit code' $CHECKLOG/shell.log >> $LOGFILE && ERROR=2 - fi + 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/* + 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: + ERROR='' + CHECKLOG=/var/log/fai/$HOSTNAME/last + if [ -r "$CHECKLOG/software.log" ] ; then + # 1 errors during executing of commands + 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 + grep 'FAILED with exit code' $CHECKLOG/shell.log >> $LOGFILE && ERROR=2 + 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}]" + eend 1 + bailout 1 + else + log "Finished execution of stage 'fai dirinstall' [$(date)]" + einfo "Finished execution of stage 'fai dirinstall'" + 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}]" - eend 1 - bailout 1 - else - log "Finished execution of stage 'fai dirinstall' [$(date)]" - einfo "Finished execution of stage 'fai dirinstall'" fi -fi +fi # BUILD_DIRTY? # }}} # BUILD_OUTPUT - execute arch specific stuff and squashfs {{{ @@ -526,12 +561,26 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/ if [ -z "$NO_ADDONS" ] ; then - cp ${TEMPLATE_DIRECTORY}/boot/addons/* "$BUILD_OUTPUT"/boot/addons/ + if ! [ -d /usr/share/grml-live/templates/boot/addons/bsd4grml ] ; then + ewarn "Boot addons not found, skipping therefor. (Consider installing package grml-live-addons)" ; eend 0 + else + # copy only files so we can handle bsd4grml on its own + for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do + test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/ + done + + if [ -z "$NO_ADDONS_BSD4GRML" ] ; then + cp -a ${TEMPLATE_DIRECTORY}/boot/addons/bsd4grml "$BUILD_OUTPUT"/boot/addons/ + fi + fi fi if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/ fi + # make sure we have recent template files available, otherwise updating + # the strings like $GRML_NAME and $VERSION might be out of date + cp ${TEMPLATE_DIRECTORY}/boot/grub/* "$BUILD_OUTPUT"/boot/grub/ if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then log "${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting." @@ -562,14 +611,19 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then sed -i "s/%VERSION%/$VERSION/" "$BUILD_OUTPUT"/boot/grub/menu.lst sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/grub/menu.lst + 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 + # 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 + sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/grub/menu.lst 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 + sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/f5 # autostart for Windows: if [ -d "${TEMPLATE_DIRECTORY}/windows/autostart/" ] ; then @@ -604,12 +658,12 @@ else eerror 'Error: Unsupported ARCH, sorry. Want to support it? Contribute!' ; eend 1 fi -if [ -f "$BUILD_OUTPUT"/live/${GRML_NAME}.squashfs -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then +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 -elif [ -f "$BUILD_OUTPUT"/live/${GRML_NAME}.squashfs -a -n "$SKIP_MKSQUASHFS" ] ; then - log "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs' as requested" - ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs' as requested" ; eend 0 +elif [ -n "$SKIP_MKSQUASHFS" ] ; then + 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: @@ -679,7 +733,7 @@ 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" ] ; then +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 else @@ -690,15 +744,54 @@ else 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} ." 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 \ + -b $BOOT_FILE -no-pad \ -o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$? - # generate md5sum of ISO if we are using class 'RELEASE': + # pad the output ISO to multiples of 256 KiB for partition table support + siz=$($getfilesize "${ISO_OUTPUT}/${ISO_NAME}") + cyls=$((siz / 512 / 32 / 16 + 1)) # C=$cyls H=16 S=32 + siz=$((cyls * 16 * 32 * 512)) # size after padding + dd if=/dev/zero bs=1 count=1 seek=$((siz - 1)) \ + of="${ISO_OUTPUT}/${ISO_NAME}" 2>/dev/null + + # support disabling hybrid ISO image + if [ "$HYBRID_METHOD" = "disable" ] ; then\ + 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 + elif [ "$HYBRID_METHOD" = "isohybrid" ] ; then + if ! which isohybrid >/dev/null 2>&1 ; then + bailout 12 "isohybrid binary not found - please install syslinux/syslinux-common" + else + log "Creating hybrid ISO file with isohybrid method" + einfo "Creating hybrid ISO file with isohybrid method" + isohybrid "${ISO_OUTPUT}/${ISO_NAME}" + eend $? + fi + # by default use our manifold boot method: + else + if ! [ -r boot/grub/core.img ] ; then + ewarn "boot/grub/core.img not found, not creating manifold boot ISO file" + else + log "Creating hybrid ISO file with manifold method" + einfo "Creating hybrid ISO file with manifold method" + echo 1 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh | cat - boot/grub/core.img | dd conv=notrunc of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc + eend $? + fi + fi + + # generate md5sum and sha1sum of ISO if we are using class 'RELEASE': case $CLASSES in *RELEASE*) [ "$RC" = 0 ] && \ - ( cd $ISO_OUTPUT && \ - md5sum ${ISO_NAME} > ${ISO_NAME}.md5 && \ - touch -r ${ISO_NAME} ${ISO_NAME}.md5 ) + ( + if cd $ISO_OUTPUT ; then + md5sum ${ISO_NAME} > ${ISO_NAME}.md5 && \ + touch -r ${ISO_NAME} ${ISO_NAME}.md5 + sha1sum ${ISO_NAME} > ${ISO_NAME}.sha1 && \ + touch -r ${ISO_NAME} ${ISO_NAME}.sha1 + fi + ) ;; esac