X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=1870969d2ca6d1dab8a866e68a4c48bf0cc131e5;hp=d02bb571c8359a8e20cc248a2511a38692d91a25;hb=b48a1eec1c190ac0ba01e89d56e5885c0b3e2d4b;hpb=0aa4a5ede5ab98c4337b7571735fcf73bc185086

diff --git a/grml-live b/grml-live
index d02bb57..1870969 100755
--- a/grml-live
+++ b/grml-live
@@ -233,7 +233,7 @@ copy_addon_file() {
     return $?
   fi
   if [ -e "$2/$1" ]; then
-    echo "Copying $1 from system"
+    log   "Copying $1 from system"
     cp "$2/$1" "${BUILD_OUTPUT}/boot/$3/"
     return $?
   fi
@@ -738,8 +738,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             for file in memdisk chain.c32 hdt.c32 menu.c32; do
               copy_addon_file "${file}" /usr/lib/syslinux addons
             done
-	    # make memtest filename FAT16/8.3 compatible
-	    mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \
+
+            # make memtest filename FAT16/8.3 compatible
+            mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \
               "${BUILD_OUTPUT}/boot/addons/memtest"
 
             # copy only files so we can handle bsd4grml on its own
@@ -754,8 +755,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
                if [ -d "$TEMPLATE_DIRECTORY"/boot/addons/bsd4grml ] ; then
                  cp -a ${TEMPLATE_DIRECTORY}/boot/addons/bsd4grml "$BUILD_OUTPUT"/boot/addons/
                else
-                 log   "bsd4grml addon not found, skipping therefore."
-                 ewarn "bsd4grml addon not found, skipping therefore." ; eend 0
+                 log   "Missing addon file: bsd4grml"
+                 ewarn "Missing addon file: bsd4grml" ; eend 0
                fi
             fi
 
@@ -770,18 +771,21 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
        if [ -e ${TEMPLATE_DIRECTORY}/compat/grub/linux.mod ]; then
          cp "${TEMPLATE_DIRECTORY}"/compat/grub/* "${BUILD_OUTPUT}"/boot/grub/
        else
-         if ! [ -x /usr/bin/grub-mkimage ] ; then
+         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 "Either install grub-common >= 1.98+20100804-14 or grub-pc." ; eend 0
+           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.
+           # 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/
-           /usr/bin/grub-mkimage -d /usr/lib/grub/*-pc -o \
+           grub-mkimage -d /usr/lib/grub/*-pc -o \
              "${BUILD_OUTPUT}/boot/grub/core.img" biosdisk iso9660 --format=i386-pc
          fi
        fi