X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=6c768059cd9738228350d0edf82381d6278f4635;hb=405d9e68c2acbda7236bae5f2d094a49d916f9ce;hp=0f83a9d94f396672dd1a09729182d829b115be3e;hpb=15245b2c5ab6d80981d3fb75f1dea773091f0778;p=grml-live.git diff --git a/grml-live b/grml-live index 0f83a9d..6c76805 100755 --- a/grml-live +++ b/grml-live @@ -240,9 +240,9 @@ if [ -z "$FORCE" ] ; then echo "${PN} [${GRML_LIVE_VERSION}]: check your configuration (or use -F to force execution):" echo echo " FAI classes: $CLASSES" - echo " main directory: $OUTPUT" - [ -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" @@ -570,7 +570,7 @@ else mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'" CURRENT_DIR=$(pwd) cd "$BUILD_OUTPUT" && - 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} ." + 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 \