X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=7a9615f440c90f70a6ae0e97c927e0f6abf5104d;hp=9c55ab6f5ce07be5517cfaa22b31f3f39edc307f;hb=93c0695a2d628b422b50b3efe232bf48adc2b05b;hpb=c98c8fdb7ce349dca24c1f6fdeabfcd03e620f22 diff --git a/grml-live b/grml-live index 9c55ab6..7a9615f 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # 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: Mon Nov 05 09:24:45 CET 2007 [mika] +# Latest change: Fri Feb 15 14:28:37 CET 2008 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -15,7 +15,7 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.0.7' +GRML_LIVE_VERSION='0.4' CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -31,6 +31,7 @@ if [ -r /var/run/fai/FAI_INSTALLATION_IN_PROGRESS ] ; then exit 1 fi +# see #449236 if [ -r /var/run/fai/fai_softupdate_is_running ] ; then echo "/usr/sbin/fai softupdate already running or was aborted before.">&2 echo "You may remove /var/run/fai/fai_softupdate_is_running and try again.">&2 @@ -41,6 +42,8 @@ fi VERBOSE='' FORCE='' UPDATE='' +BUILD_ONLY='' +HOSTNAME='' if [ -r /etc/grml/lsb-functions ] ; then . /etc/grml/lsb-functions @@ -61,12 +64,14 @@ PN=$(basename $0) # 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 + 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 # }}} @@ -88,11 +93,7 @@ if [ -z "$LOGFILE" ] ; then fi touch $LOGFILE chown root:adm $LOGFILE -chmod 640 $LOGFILE -# clean/zero logfile: -if [ -n "$ZERO_LOGFILE" ] ; then - echo -n > $LOGFILE -fi +chmod 664 $LOGFILE NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf @@ -156,7 +157,7 @@ $PN - build process script for generating a (grml based) Linux Live-ISO Usage: $PN [-a ] [-c ] [-g ] \\ [-i ] [-o ] [-s ] \\ [-t ] [-s ] \\ - [-v ] [-FVhu] + [-v ] [-bFVhu] Usage examples: @@ -176,12 +177,24 @@ http://grml.org/bugs/ } # }}} -# command line parsing {{{ +# 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 +# }}} -while getopts "a:c:g:i:o:r:s:t:v:FhuV" opt; do +# command line parsing {{{ +while getopts "a:C:c:g:i:o:r:s:t:v:bFhuVz" opt; do case "$opt" in a) ARCH="$OPTARG" ;; + b) BUILD_ONLY=1 ;; c) CLASSES="$OPTARG" ;; + C) CONFIG="$OPTARG" ;; g) GRML_NAME="$OPTARG" ;; i) ISO_NAME="$OPTARG" ;; o) OUTPUT="$OPTARG" @@ -197,6 +210,7 @@ while getopts "a:c:g:i:o:r:s:t:v:FhuV" opt; do h) usage ; bailout 0 ;; u) UPDATE=1 ;; V) VERBOSE="-v" ;; + z) SQUASHFS_ZLIB="-nolzma" ;; ?) echo "invalid option -$OPTARG" >&2; bailout 1 ;; esac done @@ -210,12 +224,33 @@ specify it on the command line using the -c option." specify it on the command line using the -o option." # }}} +# clean/zero grml-live logfile {{{ +if [ -n "$ZERO_LOGFILE" ] ; then + echo -n > $LOGFILE +fi +# }}} + +# 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)" + rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-dirinstall)" + rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-softupdate)" + rm -f /var/log/fai/"$HOSTNAME"/last \ + /var/log/fai/"$HOSTNAME"/last-dirinstall \ + /var/log/fai/"$HOSTNAME"/last-softupdate + fi +fi +# }}} + # ask user whether the setup is ok {{{ if [ -z "$FORCE" ] ; then echo 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" echo " main directory: $OUTPUT" [ -n "$CHROOT_OUTPUT" ] && echo " chroot target: $CHROOT_OUTPUT" [ -n "$BUILD_OUTPUT" ] && echo " build target: $BUILD_OUTPUT" @@ -230,7 +265,9 @@ if [ -z "$FORCE" ] ; then [ -n "$FAI_ARGS" ] && echo " additional arguments for FAI: $FAI_ARGS" [ -n "$LOGFILE" ] && echo " Logging to file: $LOGFILE" [ -n "$VERBOSE" ] && echo " Using VERBOSE mode." + [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead of 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 @@ -240,10 +277,22 @@ if [ -z "$FORCE" ] ; then echo 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." + bailout 1 + else + log "Sourcing $CONFIG" + . $CONFIG + fi +fi + start_seconds=$(cut -d . -f 1 /proc/uptime) log "------------------------------------------------------------------------------" log "Starting grml-live [${GRML_LIVE_VERSION}] run on $(date)" -log "Executed command line: $CMDLINE" +log "Executed grml-live command line:" +log "$CMDLINE" einfo "Logging actions to logfile $LOGFILE" # }}} @@ -269,10 +318,15 @@ fi # does this suck? YES! if [ -n "$SUITE" ] ; 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/" $LIVE_CONF + 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 + 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 @@ -284,7 +338,11 @@ if [ -n "$SUITE" ] ; then sed -i 's/.*grml-live.*/# removed grml-live repository/' /etc/grml/fai/apt/sources.list fi - sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $LIVE_CONF + for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do + if [ -n "$file" ] ; then + sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" "$file" + fi + done sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $NFSROOT_CONF fi @@ -300,39 +358,43 @@ 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: It does not look like you have a working chroot system. Updating not possible." - eerror "Error: It does not look like you have a working chroot system. Updating not possible." + 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 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}" fi - fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u "$HOSTNAME" $FAI_ACTION "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE + + 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 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 # 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 umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true @@ -341,11 +403,7 @@ else # notice: 'fai dirinstall' does not seem to exit appropriate, so: ERROR='' - if [ -n "$UPDATE" ] ; then - CHECKLOG=/var/log/fai/current/ - else - CHECKLOG=/var/log/fai/dirinstall/$HOSTNAME/ - fi + 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) @@ -378,19 +436,22 @@ 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/addons ] || mkdir -p "$BUILD_OUTPUT"/boot/addons [ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux - cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/isolinux/memtest + [ -d "$BUILD_OUTPUT"/boot/"${GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${GRML_NAME}" + + cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest # 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/"${GRML_NAME}"/initrd.gz find $CHROOT_OUTPUT/boot/ -name initrd\*.bak -exec rm {} \; else log "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" @@ -400,18 +461,13 @@ 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/"${GRML_NAME}"/linux26 else log "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" eerror "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1 bailout 11 fi - cp /usr/lib/syslinux/chain.c32 "$BUILD_OUTPUT"/boot/isolinux/ - cp /usr/lib/syslinux/isolinux.bin "$BUILD_OUTPUT"/boot/isolinux/ - cp /usr/lib/syslinux/memdisk "$BUILD_OUTPUT"/boot/isolinux/ - cp /usr/lib/syslinux/menu.c32 "$BUILD_OUTPUT"/boot/isolinux/ - [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates' if ! [ -d "${TEMPLATE_DIRECTORY}"/boot ] ; then log "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting." @@ -420,7 +476,7 @@ 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/ + cp ${TEMPLATE_DIRECTORY}/boot/addons/* "$BUILD_OUTPUT"/boot/addons/ if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/ @@ -485,12 +541,22 @@ 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.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 [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live - mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend + # make sure we don't leave (even an empty) base.tgz: + [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz" + + # execute squashfs: + if mksquashfs --help 2>&1 | grep -q -- -no-progress ; then + log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress" + mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB + else + log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend" + mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB + fi log "Finished execution of stage 'squashfs' [$(date)]" einfo "Finished execution of stage 'squashfs'" ; eend 0 fi @@ -510,18 +576,32 @@ 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 mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'" + CURRENT_DIR=$(pwd) - cd "$BUILD_OUTPUT" && - 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}" . ; RC=$? - cd $CURRENT_DIR + 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} ." + 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}" . ; RC=$? + + # generate md5sum 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 ) + ;; + esac + + cd $CURRENT_DIR + fi + if [ "$RC" = 0 ] ; then log "Finished execution of stage 'iso build' [$(date)]" einfo "Finished execution of stage 'iso build'" ; eend 0