X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml-live;h=8b3ac133fc26aa76b7e4271e5f0f6de9ce7b203a;hb=e68d43e7395ac69d800242fbc83081b0c91e945c;hp=3c1549789baf2da0881e34d6ba12b1b097532c0e;hpb=eab80d912a70e64dd95218390dc1221f0792505a;p=grml-live.git
diff --git a/grml-live b/grml-live
index 3c15497..8b3ac13 100755
--- a/grml-live
+++ b/grml-live
@@ -283,21 +283,6 @@ copy_addon_file() {
}
# }}}
-# read local (non-packaged) configuration {{{
-LOCAL_CONFIG=/etc/grml/grml-live.local
-if [ -r "$LOCAL_CONFIG" ] ; then
- . $LOCAL_CONFIG
-else
- LOCAL_CONFIG=''
-fi
-
-if [ -n "${GRML_LIVE_SOURCES:-}" ] ; then
- eerror "Config variable \$GRML_LIVE_SOURCES is set. This variable has been deprecated."
- ewarn "Please set up ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/* instead."
- bailout 1
-fi
-# }}}
-
# command line parsing {{{
while getopts "a:C:c:d:D:g:i:I:o:r:s:t:T:U:v:AbBFnNquVz" opt; do
case "$opt" in
@@ -306,7 +291,7 @@ while getopts "a:C:c:d:D:g:i:I:o:r:s:t:T:U:v:AbBFnNquVz" opt; do
b) BUILD_ONLY=1 ;;
B) BUILD_DIRTY=1 ;;
c) CLASSES="$OPTARG" ;;
- C) CONFIG="$OPTARG" ;;
+ C) GRML_LIVE_LOCAL_CONFIG="$OPTARG" ;;
d) DATE="$OPTARG" ;;
D) GRML_FAI_CONFIG="$OPTARG" ;;
g) GRML_NAME="$OPTARG" ;;
@@ -332,6 +317,31 @@ done
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 [ -r "/etc/grml/grml-live.local" ]; then
+ GRML_LIVE_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
+ else
+ eerror "Could not read specified local configuration file \"$GRML_LIVE_LOCAL_CONFIG\"."
+ bailout 1
+ fi
+ GRML_LIVE_LOCAL_CONFIG=$(readlink -f "$GRML_LIVE_LOCAL_CONFIG")
+else
+ GRML_LIVE_LOCAL_CONFIG=''
+fi
+
+if [ -n "${GRML_LIVE_SOURCES:-}" ] ; then
+ eerror "Config variable \$GRML_LIVE_SOURCES is set. This variable has been deprecated."
+ ewarn "Please set up \${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/* instead."
+ bailout 1
+fi
+# }}}
+
# assume sane defaults (if not set already) {{{
[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
[ -n "$BOOT_METHOD" ] || BOOT_METHOD='isolinux'
@@ -360,6 +370,7 @@ shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter
[ -n "$CHROOT_ARCHIVE" ] || CHROOT_ARCHIVE="$OUTPUT/$(basename $CHROOT_OUTPUT).tgz"
[ -n "$ISO_OUTPUT" ] || ISO_OUTPUT="$OUTPUT/grml_isos"
[ -n "$LOG_OUTPUT" ] || LOG_OUTPUT="$OUTPUT/grml_logs"
+[ -n "$REPORTS" ] || REPORTS="${LOG_OUTPUT}/reports/"
# }}}
# some misc checks before executing FAI {{{
@@ -393,8 +404,7 @@ 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"
+ [ -n "$GRML_LIVE_LOCAL_CONFIG" ] && echo " Configuration: $GRML_LIVE_LOCAL_CONFIG"
[ -n "$GRML_FAI_CONFIG" ] && echo " Config directory: $GRML_FAI_CONFIG"
echo " main directory: $OUTPUT"
[ -n "$UNPACK_CHROOT" ] && echo " Chroot from: $UNPACK_CHROOT"
@@ -494,9 +504,7 @@ fi
start_seconds=$(cut -d . -f 1 /proc/uptime)
log "------------------------------------------------------------------------------"
log "Starting grml-live [${GRML_LIVE_VERSION}] run on $(date)"
-if [ -n "$LOCAL_CONFIG" ]; then
- log "Using local config file: $LOCAL_CONFIG"
-fi
+log "Using local config file: $GRML_LIVE_LOCAL_CONFIG"
log "Executed grml-live command line:"
log "$CMDLINE"
@@ -508,8 +516,7 @@ 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
@@ -538,7 +545,7 @@ case $SUITE in
esac
export SUITE # make sure it's available in FAI scripts
-for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" "$NFSROOT_CONF" ; do
+for file in "$LIVE_CONF" "$GRML_LIVE_LOCAL_CONFIG" "$NFSROOT_CONF" ; do
if [ -n "$file" ] ; then
sed "s|^FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" "$file" | sponge "$file"
fi
@@ -618,8 +625,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 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" fai $VERBOSE \
+ 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 \
-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
@@ -696,20 +703,78 @@ fi # BUILD_DIRTY?
# package validator {{{
CHECKLOG=/var/log/fai/$HOSTNAME/last
-# package validator
-if [ -r "$CHECKLOG/package_errors.log" ] && grep -q '[a-z]' "$CHECKLOG/package_errors.log" ; then
+if [ -r "$CHECKLOG/dpkg.selections" ] ; then
+ package_count=$(wc -l "$CHECKLOG/dpkg.selections" | awk '{print $1}')
+else
+ package_count="unknown"
+fi
- if [ -n "$EXIT_ON_MISSING_PACKAGES" -a -z "$BUILD_DIRTY" ] ; then
- eerror "The following packages were requested for installation but could not be processed:"
- cat $CHECKLOG/package_errors.log
- eerror "... exiting as requested via \$EXIT_ON_MISSING_PACKAGES."
- eend 1
- bailout 13
- else
- ewarn "The following packages were requested for installation but could not be processed:"
- cat $CHECKLOG/package_errors.log
- eend 0
- fi
+mkdir -p "$REPORTS"
+REPORT_MISSING_PACKAGES="${REPORTS}/TEST-MissingPackages.xml"
+
+# check for missing packages
+if ! [ -s "$CHECKLOG/package_errors.log" ] ; then
+ einfo "No missing packages found, generating empty junit report."
+
+ cat > "${REPORT_MISSING_PACKAGES}" << EOF
+
+
+
+
+
+
+
+
+
+EOF
+ eend 0
+else
+ einfo "Missing packages found, generating junit report."
+
+ if [ -r "$CHECKLOG/package_errors.log" ] ; then
+ package_errors=$(wc -l "$CHECKLOG/package_errors.log" | awk '{print $1}')
+ else
+ package_errors="unknown"
+ fi
+
+ mkdir -p "$REPORTS"
+ REPORT_MISSING_PACKAGES="${REPORTS}/TEST-MissingPackages.xml"
+
+ cat > "${REPORT_MISSING_PACKAGES}" << EOF
+
+
+EOF
+
+ for package in $(awk '{print $5}' "${CHECKLOG}/package_errors.log" | sed 's/\.$//') ; do
+ cat >> "${REPORT_MISSING_PACKAGES}" << EOF
+
+
+Package $package is missing in chroot
+
+
+EOF
+ done
+
+ cat >> "${REPORT_MISSING_PACKAGES}" << EOF
+
+
+
+
+
+EOF
+ eend 0
+
+ if [ -n "$EXIT_ON_MISSING_PACKAGES" -a -z "$BUILD_DIRTY" ] ; then
+ eerror "The following packages were requested for installation but could not be processed:"
+ cat "$CHECKLOG/package_errors.log"
+ eerror "... exiting as requested via \$EXIT_ON_MISSING_PACKAGES."
+ eend 1
+ bailout 13
+ else
+ ewarn "The following packages were requested for installation but could not be processed:"
+ cat "$CHECKLOG/package_errors.log"
+ eend 0
+ fi
fi
# }}}
@@ -1126,17 +1191,53 @@ else
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
+ # 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
+ MKISOFS='xorriso -as mkisofs'
+ elif which mkisofs >/dev/null 2>&1; then
MKISOFS='mkisofs'
elif which genisoimage >/dev/null 2>&1; then
MKISOFS='genisoimage'
else
- log "Error: neither mkisofs nor genisoimage available - can not create ISO."
- eerror "Error: neither mkisofs nor genisoimage available - can not create ISO." ; eend 1
+ log "Error: neither xorriso nor mkisofs nor genisoimage available - can not create ISO."
+ eerror "Error: neither xorriso nor mkisofs nor genisoimage available - can not create ISO." ; eend 1
bailout
fi
+ case "$ARCH" in
+ amd64)
+ # using -eltorito-alt-boot is limited to xorriso for now
+ case "$MKISOFS" in
+ xorriso*)
+ einfo "Using xorriso for ISO generation." ; 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
+ ;;
+ esac
+ ;;
+ esac
+
CURRENT_DIR=$(pwd)
if cd "$BUILD_OUTPUT" ; then
if [ "$BOOT_METHOD" = "grub2" ]; then
@@ -1147,7 +1248,7 @@ else
dd of=boot/grub/toriboot.bin conv=notrunc 2>/dev/null
fi
log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J $BOOT_ARGS -o ${ISO_OUTPUT}/${ISO_NAME} ."
- "$MKISOFS" -V "${GRML_NAME} ${VERSION}" -publisher 'grml-live | grml.org' \
+ $MKISOFS -V "${GRML_NAME} ${VERSION}" -publisher 'grml-live | grml.org' \
-l -r -J $BOOT_ARGS -no-pad \
-o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
# both of these need core.img there, so itâs easier to write it here
@@ -1169,28 +1270,10 @@ else
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"
- # Notes for consideration:
- # "-entry 4 -type 1c"
- # * using 4 as the partition number is supposed to help with BIOSes
- # that only support USB-Zip boot
- # * using 1c (i.e. hidden FAT32 LBA), instead of the default 0x17
- # (hidden NTFS, IIRC), as the partition type is sometimes needed
- # to get the BIOS even look at the partition created by isohybrid
- isohybrid "${ISO_OUTPUT}/${ISO_NAME}"
- eend $?
- fi
- # by default use our manifold boot method:
- else
+ elif [ "$HYBRID_METHOD" = "manifold" ] ; then
# isoinfo is part of both mkisofs and genisoimage so we're good
bootoff=$(isoinfo -l -i "${ISO_OUTPUT}/${ISO_NAME}" | \
- sed -n '/^.*\[ *\([0-9]*\)[] ].* ISOLINUX.BIN;1 *$/s//\1/p')
+ sed -n '/^.*\[ *\([0-9]*\)[] ].* ISOLINUX.BIN[;1]* *$/s//\1/p')
if ! [ -r boot/grub/core.img ] ; then
ewarn "boot/grub/core.img not found, not creating manifold boot ISO file"
elif [ "${bootoff:-0}" -lt 1 ] ; then
@@ -1208,6 +1291,29 @@ else
fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
eend $?
fi
+ # use isohybrid as default
+ else
+ 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"
+ # Notes for consideration:
+ # "-entry 4 -type 1c"
+ # * using 4 as the partition number is supposed to help with BIOSes
+ # that only support USB-Zip boot
+ # * using 1c (i.e. hidden FAT32 LBA), instead of the default 0x17
+ # (hidden NTFS, IIRC), as the partition type is sometimes needed
+ # to get the BIOS even look at the partition created by isohybrid
+ if isohybrid --help | grep -q -- --uefi ; then
+ einfo "Detected uefi support for isohybrid, enabling."
+ ISOHYBRID_OPTIONS=--uefi
+ fi
+
+ log "isohybrid $ISOHYBRID_OPTIONS ${ISO_OUTPUT}/${ISO_NAME}"
+ isohybrid $ISOHYBRID_OPTIONS "${ISO_OUTPUT}/${ISO_NAME}"
+ eend $?
+ fi
fi
# generate md5sum and sha1sum of ISO if we are using class 'RELEASE':