X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=9a1cd94c59179ed97b8c16d028b1f036a2a707f6;hp=1e8ddadd4dc2eed7151017e28a1c922067991707;hb=b8db7a090a524fdbab9e455e05a82add746ff44c;hpb=9dafaad2fe959f195d68a38655f60d00ee028256 diff --git a/grml-live b/grml-live index 1e8ddad..9a1cd94 100755 --- a/grml-live +++ b/grml-live @@ -24,7 +24,7 @@ fi # set -e # global variables -GRML_LIVE_VERSION='0.16.1' +GRML_LIVE_VERSION='0.17.0' PN="$(basename $0)" CMDLINE="$0 $@" ADDONS_LIST_FILE='/boot/isolinux/addons_list.cfg' @@ -56,6 +56,7 @@ Usage: $PN [options, see as follows] -N bootstrap (build chroot) only, do not create files for ISO -o main output directory of the build process -q skip mksquashfs + -Q skip netboot package build -r release name -s Debian suite; values: etch, lenny, squeeze, sid -t place of the templates @@ -119,6 +120,8 @@ BUILD_ONLY='' BUILD_DIRTY='' BOOTSTRAP_ONLY='' HOSTNAME='' +USERNAME='' +CONFIGDUMP='' # don't use colors/escape sequences if [ -r /lib/lsb/init-functions ] ; then @@ -164,6 +167,7 @@ umount_all() { bailout() { rm -f /var/run/fai/fai_softupdate_is_running \ /var/run/fai/FAI_INSTALLATION_IN_PROGRESS + [ -n "$CONFIGDUMP" ] && rm -f "$CONFIGDUMP" [ -n "$SQUASHFS_STDERR" ] && rm -rf "$SQUASHFS_STDERR" umount_all [ -n "$1" ] && EXIT="$1" || EXIT="1" @@ -183,6 +187,7 @@ bailout() { [ -n "${CHROOT_OUTPUT}" -a -d "${CHROOT_OUTPUT}" ] && chown -R "${CHOWN_USER}:" "${CHROOT_OUTPUT}" [ -n "${ISO_OUTPUT}" -a -d "${ISO_OUTPUT}" ] && chown -R "${CHOWN_USER}:" "${ISO_OUTPUT}" [ -n "${LOG_OUTPUT}" -a -d "${LOG_OUTPUT}" ] && chown -R "${CHOWN_USER}:" "${LOG_OUTPUT}" + [ -n "${NETBOOT}" -a -d "${NETBOOT}" ] && chown -R "${CHOWN_USER}:" "${NETBOOT}" [ -n "${CHROOT_ARCHIVE}" -a -f "${CHROOT_ARCHIVE}" ] && chown -R "${CHOWN_USER}:" "${CHROOT_ARCHIVE}" eend 0 fi @@ -284,23 +289,24 @@ copy_addon_file() { # }}} # command line parsing {{{ -while getopts "a:C:c:d:D:g:i:I:o:r:s:t:T:U:v:AbBFnNquVz" opt; do +while getopts "a:C:c:d:D:g:i:I:o:r:s:t:T:U:v:AbBFnNqQuVz" opt; do case "$opt" in a) ARCH="$OPTARG" ;; A) PACK_ARTIFACTS=1 ;; b) BUILD_ONLY=1 ;; B) BUILD_DIRTY=1 ;; c) CLASSES="$OPTARG" ;; - C) GRML_LIVE_LOCAL_CONFIG="$OPTARG" ;; + C) LOCAL_CONFIG="$(readlink -f $OPTARG)" ;; d) DATE="$OPTARG" ;; - D) GRML_FAI_CONFIG="$OPTARG" ;; + D) GRML_FAI_CONFIG="$(readlink -f $OPTARG)" ;; g) GRML_NAME="$OPTARG" ;; i) ISO_NAME="$OPTARG" ;; I) CHROOT_INSTALL="$OPTARG" ;; n) SKIP_MKISOFS=1 ;; N) BOOTSTRAP_ONLY=1; SKIP_MKISOFS=1; SKIP_MKSQUASHFS=1 ;; - o) OUTPUT="$OPTARG" ;; + o) OUTPUT="$(readlink -f $OPTARG)" ;; q) SKIP_MKSQUASHFS=1 ;; + Q) SKIP_NETBOOT=1 ;; r) RELEASENAME="$OPTARG" ;; s) SUITE="$OPTARG" ;; t) TEMPLATE_DIRECTORY="$OPTARG";; @@ -318,21 +324,21 @@ shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter # }}} # read local (non-packaged) configuration {{{ -if [ -z "$GRML_LIVE_LOCAL_CONFIG" ]; then +if [ -z "$LOCAL_CONFIG" ]; then if [ -r "/etc/grml/grml-live.local" ]; then - GRML_LIVE_LOCAL_CONFIG="/etc/grml/grml-live.local" + LOCAL_CONFIG="/etc/grml/grml-live.local" fi fi -if [ -n "$GRML_LIVE_LOCAL_CONFIG" ]; then - if [ -r "$GRML_LIVE_LOCAL_CONFIG" ]; then - . $GRML_LIVE_LOCAL_CONFIG +if [ -n "$LOCAL_CONFIG" ]; then + if [ -r "$LOCAL_CONFIG" ]; then + . $LOCAL_CONFIG else - eerror "Could not read specified local configuration file \"$GRML_LIVE_LOCAL_CONFIG\"." + eerror "Could not read specified local configuration file \"$LOCAL_CONFIG\"." bailout 1 fi - GRML_LIVE_LOCAL_CONFIG=$(readlink -f "$GRML_LIVE_LOCAL_CONFIG") + LOCAL_CONFIG=$(readlink -f "$LOCAL_CONFIG") else - GRML_LIVE_LOCAL_CONFIG='' + LOCAL_CONFIG='' fi if [ -n "${GRML_LIVE_SOURCES:-}" ] ; then @@ -371,6 +377,7 @@ fi [ -n "$ISO_OUTPUT" ] || ISO_OUTPUT="$OUTPUT/grml_isos" [ -n "$LOG_OUTPUT" ] || LOG_OUTPUT="$OUTPUT/grml_logs" [ -n "$REPORTS" ] || REPORTS="${LOG_OUTPUT}/reports/" +[ -n "$NETBOOT" ] || NETBOOT="${OUTPUT}/netboot/" # }}} # some misc checks before executing FAI {{{ @@ -404,7 +411,7 @@ if [ -z "$FORCE" ] ; then echo "${PN} [${GRML_LIVE_VERSION}]: check your configuration (or use -F to force execution):" echo echo " FAI classes: $CLASSES" - [ -n "$GRML_LIVE_LOCAL_CONFIG" ] && echo " Configuration: $GRML_LIVE_LOCAL_CONFIG" + [ -n "$LOCAL_CONFIG" ] && echo " Configuration: $LOCAL_CONFIG" [ -n "$GRML_FAI_CONFIG" ] && echo " Config directory: $GRML_FAI_CONFIG" echo " main directory: $OUTPUT" [ -n "$UNPACK_CHROOT" ] && echo " Chroot from: $UNPACK_CHROOT" @@ -436,6 +443,7 @@ if [ -z "$FORCE" ] ; then echo " Bootstrapping only and not building (files for) ISO." else [ -n "$SKIP_MKSQUASHFS" ] && echo " Skipping creation of SQUASHFS file." + [ -n "$SKIP_NETBOOT" ] && echo " Skipping creation of NETBOOT package." [ -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." @@ -457,6 +465,7 @@ if [ -n "${PACK_ARTIFACTS}" ]; then [ -n "${BUILD_OUTPUT}" -a -d "${BUILD_OUTPUT}" ] && rm -r "${BUILD_OUTPUT}" [ -n "${ISO_OUTPUT}" -a -d "${ISO_OUTPUT}" ] && rm -r "${ISO_OUTPUT}" [ -n "${LOG_OUTPUT}" -a -d "${LOG_OUTPUT}" ] && rm -r "${LOG_OUTPUT}" + [ -n "${NETBOOT}" -a -d "${NETBOOT}" ] && rm -r "${NETBOOT}" fi # }}} @@ -504,20 +513,26 @@ fi start_seconds=$(cut -d . -f 1 /proc/uptime) log "------------------------------------------------------------------------------" log "Starting grml-live [${GRML_LIVE_VERSION}] run on $(date)" -log "Using local config file: $GRML_LIVE_LOCAL_CONFIG" +log "Using local config file: $LOCAL_CONFIG" log "Executed grml-live command line:" log "$CMDLINE" einfo "Logging actions to logfile $LOGFILE" # }}} +# dump config variables into file, for script access {{{ +CONFIGDUMP=$(mktemp) +set | egrep \ + '^(GRML_NAME|RELEASENAME|DATE|VERSION|SUITE|ARCH|DISTRI_NAME|USERNAME|HOSTNAME|APT_PROXY)=' \ + > ${CONFIGDUMP} +# }}} + # unpack chroot {{{ if [ -n "${UNPACK_CHROOT}" ]; then log "Unpacking chroot from ${UNPACK_CHROOT}" einfo "Unpacking chroot from ${UNPACK_CHROOT}" [ -d "$CHROOT_OUTPUT" ] || mkdir -p "${CHROOT_OUTPUT}" - tar -xf "${UNPACK_CHROOT}" -C "${CHROOT_OUTPUT}/" --strip-components 1 | RC=$? - echo $RC + tar -xf "${UNPACK_CHROOT}" -C "${CHROOT_OUTPUT}/" --strip-components 1 ; RC=$? if [ "$RC" != 0 ] ; then eend 1 bailout 1 @@ -546,7 +561,7 @@ case $SUITE in esac export SUITE # make sure it's available in FAI scripts -for file in "$LIVE_CONF" "$GRML_LIVE_LOCAL_CONFIG" "$NFSROOT_CONF" ; do +for file in "$LIVE_CONF" "$LOCAL_CONFIG" "$NFSROOT_CONF" ; do if [ -n "$file" ] ; then sed "s|^FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" "$file" | sponge "$file" fi @@ -626,8 +641,8 @@ else echo force-unsafe-io > "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d/unsafe-io" log "Executed FAI command line:" - log "BUILD_ONLY=$BUILD_ONLY BOOTSTRAP_ONLY=$BOOTSTRAP_ONLY GRML_LIVE_LOCAL_CONFIG=$GRML_LIVE_LOCAL_CONFIG fai $VERBOSE -C $GRML_FAI_CONFIG -s file:///$GRML_FAI_CONFIG/config -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS" - BUILD_ONLY="$BUILD_ONLY" BOOTSTRAP_ONLY="$BOOTSTRAP_ONLY" GRML_LIVE_LOCAL_CONFIG="$GRML_LIVE_LOCAL_CONFIG" fai $VERBOSE \ + log "BUILD_ONLY=$BUILD_ONLY BOOTSTRAP_ONLY=$BOOTSTRAP_ONLY GRML_LIVE_CONFIG=$CONFIGDUMP fai $VERBOSE -C $GRML_FAI_CONFIG -s file:///$GRML_FAI_CONFIG/config -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS" + BUILD_ONLY="$BUILD_ONLY" BOOTSTRAP_ONLY="$BOOTSTRAP_ONLY" GRML_LIVE_CONFIG="$CONFIGDUMP" fai $VERBOSE \ -C "$GRML_FAI_CONFIG" -s "file:///$GRML_FAI_CONFIG/config" -c"$CLASSES" \ -u "$HOSTNAME" "$FAI_ACTION" "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE RC="$PIPESTATUS" # notice: bash-only @@ -879,27 +894,12 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then fi cp ${TEMPLATE_DIRECTORY}/boot/grub/* "$BUILD_OUTPUT"/boot/grub/ - if [ -e ${TEMPLATE_DIRECTORY}/compat/grub/linux.mod ]; then - cp "${TEMPLATE_DIRECTORY}"/compat/grub/* "${BUILD_OUTPUT}"/boot/grub/ - else - if ! which "grub-mkimage" >/dev/null 2>&1 ; then - log "grub-mkimage not found, skipping Grub step therefore." ; eend 0 - ewarn "grub-mkimage not found, skipping Grub step therefore." - ewarn "Please install grub-pc-bin or grub-common >= 1.98+20100804-14." ; eend 0 - elif ! grub-mkimage --help | grep -q -- --format ; then - log "grub-mkimage does not support --format=i386-pc, skipping Grub step therefore." ; eend 0 - ewarn "grub-mkimage does not support --format=i386-pc, skipping Grub step therefore." - ewarn "Please install grub-common >= 1.98+20100804-14 or grub-pc-bin." ; eend 0 - else - # copy system grub files if grml-live-compat is not installed - cp -a /usr/lib/grub/*-pc/*.mod "${BUILD_OUTPUT}"/boot/grub/ - cp -a /usr/lib/grub/*-pc/*.o "${BUILD_OUTPUT}"/boot/grub/ - cp -a /usr/lib/grub/*-pc/*.lst "${BUILD_OUTPUT}"/boot/grub/ - cp -a /usr/share/grub/ascii.pf2 "${BUILD_OUTPUT}"/boot/grub/ - grub-mkimage -d /usr/lib/grub/*-pc -o \ - "${BUILD_OUTPUT}/boot/grub/core.img" biosdisk iso9660 --format=i386-pc - fi - fi + # copy grub files from target + cp -a "${CHROOT_OUTPUT}"/usr/lib/grub/*-pc/*.mod "${BUILD_OUTPUT}"/boot/grub/ + cp -a "${CHROOT_OUTPUT}"/usr/lib/grub/*-pc/*.o "${BUILD_OUTPUT}"/boot/grub/ + cp -a "${CHROOT_OUTPUT}"/usr/lib/grub/*-pc/*.lst "${BUILD_OUTPUT}"/boot/grub/ + cp -a "${CHROOT_OUTPUT}"/usr/share/grub/ascii.pf2 "${BUILD_OUTPUT}"/boot/grub/ + cp -a "${CHROOT_OUTPUT}"/boot/grub/core.img "${BUILD_OUTPUT}"/boot/grub/ if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then log "Error: ${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting." @@ -1193,8 +1193,7 @@ else fi # support xorriso as well mkisofs and genisoimage - if which xorriso >/dev/null 2>&1 && \ - dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' xorriso 2>/dev/null) gt-nl 1.1.6-2 ; then + if which xorriso >/dev/null 2>&1 ; then MKISOFS='xorriso -as mkisofs' elif which mkisofs >/dev/null 2>&1; then MKISOFS='mkisofs' @@ -1212,28 +1211,39 @@ else case "$MKISOFS" in xorriso*) einfo "Using xorriso for ISO generation." ; eend 0 + eindent - if [ -r "${CHROOT_OUTPUT}/var/lib/grml_live_efi.img" ] ; then - einfo "Found /var/lib/grml_live_efi.img - moving to /boot/efi.img for ISO." - log "Found /var/lib/grml_live_efi.img - moving to /boot/efi.img for ISO." - mv "${CHROOT_OUTPUT}/var/lib/grml_live_efi.img" "${BUILD_OUTPUT}/boot/efi.img" - eend $? - fi - - if [ -r "${CHROOT_OUTPUT}/var/lib/grml_live_bootx64.efi" ] ; then - einfo "Found /var/lib/grml_live_bootx64.efi - moving to /efi/boot/bootx64.efi for ISO" - log "Found /var/lib/grml_live_bootx64.efi - moving to /efi/boot/bootx64.efi for ISO" - mkdir -p "${BUILD_OUTPUT}/efi/boot/" - mv "${CHROOT_OUTPUT}/var/lib/grml_live_bootx64.efi" "${BUILD_OUTPUT}/efi/boot/bootx64.efi" - eend $? + if ! dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' xorriso 2>/dev/null) gt-nl 1.1.6-1 ; then + log "Disabling (U)EFI boot support since xorriso version is not recent enough." + ewarn "Disabling (U)EFI boot support since xorriso version is not recent enough." ; eend 0 + else + log "xorriso with -eltorito-alt-boot present, enabling (U)EFI boot support." + einfo "xorriso with -eltorito-alt-boot present, enabling (U)EFI boot support." ; eend 0 + + if [ -r "${CHROOT_OUTPUT}/var/lib/grml_live_efi.img" ] ; then + einfo "Found /var/lib/grml_live_efi.img - moving to /boot/efi.img for ISO." + log "Found /var/lib/grml_live_efi.img - moving to /boot/efi.img for ISO." + mv "${CHROOT_OUTPUT}/var/lib/grml_live_efi.img" "${BUILD_OUTPUT}/boot/efi.img" + eend $? + fi + + if [ -r "${CHROOT_OUTPUT}/var/lib/grml_live_bootx64.efi" ] ; then + einfo "Found /var/lib/grml_live_bootx64.efi - moving to /efi/boot/bootx64.efi for ISO" + log "Found /var/lib/grml_live_bootx64.efi - moving to /efi/boot/bootx64.efi for ISO" + mkdir -p "${BUILD_OUTPUT}/efi/boot/" + mv "${CHROOT_OUTPUT}/var/lib/grml_live_bootx64.efi" "${BUILD_OUTPUT}/efi/boot/bootx64.efi" + eend $? + fi + + if [ -r "${BUILD_OUTPUT}"/boot/efi.img ] ; then + einfo "/boot/efi.img found and amd64 architecture present, extending boot arguments." + log "/boot/efi.img found and amd64 architecture present, extending boot arguments." + BOOT_ARGS="$BOOT_ARGS -boot-info-table -eltorito-alt-boot -e boot/efi.img -no-emul-boot" + eend $? + fi fi - if [ -r "${BUILD_OUTPUT}"/boot/efi.img ] ; then - einfo "/boot/efi.img found and amd64 architecture present, extending boot arguments." - log "/boot/efi.img found and amd64 architecture present, extending boot arguments." - BOOT_ARGS="$BOOT_ARGS -boot-info-table -eltorito-alt-boot -e boot/efi.img -no-emul-boot" - eend $? - fi + eoutdent ;; esac ;; @@ -1345,6 +1355,61 @@ else fi # }}} +# netboot package {{{ +create_netbootpackage() { + local OUTPUT_FILE="${NETBOOT}/grml_netboot_package_${GRML_NAME}_${VERSION}.tar.bz2" + + if [ -f "${OUTPUT_FILE}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then + log "Skipping stage 'netboot' as $OUTPUT_FILE exists already." + ewarn "Skipping stage 'netboot' as $OUTPUT_FILE exists already." ; eend 0 + return 0 + elif [ -n "$SKIP_NETBOOT" ] ; then + log "Skipping stage 'netboot' as requested via option -Q" + ewarn "Skipping stage 'netboot' as requested via option -Q" ; eend 0 + return 0 + fi + + mkdir -p "$NETBOOT" + + if ! [ -r "${CHROOT}/usr/lib/syslinux/pxelinux.0" ] ; then + ewarn "File /usr/lib/syslinux/pxelinux.0 not found in build chroot." ; eend 0 + eindent + einfo "Install syslinux[-common] package in chroot to get a netboot package." + eoutdent + return 0 + fi + + local OUTPUTDIR="${NETBOOT}/build_tmp" + local WORKING_DIR="${OUTPUTDIR}/grml_netboot_package_${GRML_NAME}_${VERSION}/tftpboot/" + + mkdir -p "$WORKING_DIR" + + cp "${CHROOT_OUTPUT}"/boot/vmlinuz-* "$WORKING_DIR"/linux26 + cp "${CHROOT_OUTPUT}"/boot/initrd.img-* "$WORKING_DIR"/initrd.img + cp "${CHROOT_OUTPUT}"/usr/lib/syslinux/pxelinux.0 "${WORKING_DIR}/pxelinux.0" + + if [ -r "${BUILD_OUTPUT}/boot/isolinux/netboot.cfg" ] ; then + mkdir -p "${WORKING_DIR}/pxelinux.cfg/default" + cp "${BUILD_OUTPUT}/boot/isolinux/netboot.cfg" "${WORKING_DIR}/pxelinux.cfg/default" + else + ewarn "File ${BUILD_OUTPUT}/boot/isolinux/netboot.cfg not found." ; eend 0 + fi + + mkdir -p "${WORKING_DIR}/pxelinux.cfg" + + if tar -C "$OUTPUTDIR" -jcf "${OUTPUT_FILE}" "grml_netboot_package_${GRML_NAME}_${VERSION}" ; then + einfo "Generated netboot package ${OUTPUT_FILE}" ; eend 0 + rm -rf "${OUTPUTDIR}" + else + rm -rf "${OUTPUTDIR}" + eerror "Could not generate netboot package ${OUTPUT_FILE}" ; eend 1 + bailout 21 + fi +} + +create_netbootpackage +# }}} + # pack artifacts {{{ if [ -n "$PACK_ARTIFACTS" ]; then log "Packing artifcats"