X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=3a2301f1caa157c38f60aab18db021a25553edb7;hb=6eb1b1e874476af08d8dc8deb21e3f522e6973d5;hp=ac8f9cf3d0db688a15c7f0e38f60282859c3dc31;hpb=a50de9f4017b0b811cc86e3c2a08278bbf2d7a51;p=grml-live.git diff --git a/grml-live b/grml-live index ac8f9cf..3a2301f 100755 --- a/grml-live +++ b/grml-live @@ -754,11 +754,12 @@ else EOF - for package in $(awk '{print $5}' "${CHECKLOG}/package_errors.log" | sed 's/\.$//') ; do + for package in $(awk '{print $1}' "${CHECKLOG}/package_errors.log") ; do + failure_reason="$(awk "/$package/ {print \$2}" "${CHECKLOG}/package_errors.log")" cat >> "${REPORT_MISSING_PACKAGES}" << EOF - -Package $package is missing in chroot + +Package $package is missing in chroot (${failure_reason}) EOF @@ -955,7 +956,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then sed -i "s/%SHORT_NAME%/$SHORT_NAME/g" "${file}" sed -i "s/%VERSION%/$VERSION/g" "${file}" - [ -n "$DEFAULT_BOOTOPTIONS" ] && sed -i "s/ boot=live/ boot=live $DEFAULT_BOOTOPTIONS/" "${file}" + [ -n "$DEFAULT_BOOTOPTIONS" ] && sed -i "s; boot=live; boot=live $DEFAULT_BOOTOPTIONS;" "${file}" if [ -n "$NO_BOOTID" ] ; then sed -i "s/ bootid=%BOOTID%//g" "${file}" # drop bootid bootoption @@ -1392,7 +1393,12 @@ create_netbootpackage() { if [ -r "${BUILD_OUTPUT}/boot/isolinux/netboot.cfg" ] ; then 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 + log "File ${BUILD_OUTPUT}/boot/isolinux/netboot.cfg not found." + ewarn "File ${BUILD_OUTPUT}/boot/isolinux/netboot.cfg not found." + eindent + log "Hint: Are you using custom templates which do not provide netboot.cfg?" + ewarn "Hint: Are you using custom templates which do not provide netboot.cfg?" ; eend 0 + eoutdent fi if tar -C "$OUTPUTDIR" -jcf "${OUTPUT_FILE}" "grml_netboot_package_${GRML_NAME}_${VERSION}" ; then