X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=fd4f1a9f9165d7874ed8307f93198951aef70061;hp=199edaa8de4f4f24ede7624171c3a6973e952e7b;hb=48d26385d791ad737fe36779be5ad231bb86013a;hpb=03d6cbdfdfe85a9823fac9ec86b34517efb0011c

diff --git a/grml-live b/grml-live
index 199edaa..fd4f1a9 100755
--- a/grml-live
+++ b/grml-live
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Nov 26 15:13:41 CET 2007 [mika]
+# Latest change: Sun Dec 09 16:24:55 CET 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -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"
@@ -356,8 +356,8 @@ fi
 
 if [ -n "$UPDATE" ] ; 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 not possible."
+      eerror "Error: does not look like you have a working chroot. Updating not possible. (Drop -u option?)"
       eend 1
       bailout 20
    fi
@@ -455,11 +455,6 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
          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."
@@ -570,7 +565,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 \