From: Christian Hofstaedtler <ch@grml.org>
Date: Fri, 29 Jul 2011 23:38:07 +0000 (+0200)
Subject: Use ifcpu64.c32, vesamenu.c32, isolinux.bin from syslinux-common
X-Git-Tag: v0.16.1~31
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=9c238dcb3971aa7a27e68b556e94b98c35966cac

Use ifcpu64.c32, vesamenu.c32, isolinux.bin from syslinux-common
---

diff --git a/grml-live b/grml-live
index 6a96ce4..a59a76a 100755
--- a/grml-live
+++ b/grml-live
@@ -701,8 +701,15 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           bailout 8
        fi
 
+       # copy system-provided isolinux files
+       for file in ifcpu64.c32 isolinux.bin vesamenu.c32; do
+         cp -a "/usr/lib/syslinux/${file}" "${TEMPLATE_DIRECTORY}/boot/isolinux/"
+       done
+
        # *always* copy files to output directory so the variables
        # get adjusted according to the build
+       # Note: if grml-live-compat is installed, this will update the
+       # system-provided isolinux files.
        cp ${TEMPLATE_DIRECTORY}/boot/isolinux/*  "$BUILD_OUTPUT"/boot/isolinux/
 
        if [ -n "$NO_ADDONS" ] ; then
@@ -722,6 +729,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             done
 
             # copy only files so we can handle bsd4grml on its own
+            # Note: if grml-live-compat is installed, this will update the
+            # system-provided files.
             for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
               test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/
             done
diff --git a/templates/boot/isolinux/ifcpu64.c32 b/templates/boot/isolinux/ifcpu64.c32
deleted file mode 100644
index ce4f89c..0000000
Binary files a/templates/boot/isolinux/ifcpu64.c32 and /dev/null differ
diff --git a/templates/boot/isolinux/isolinux.bin b/templates/boot/isolinux/isolinux.bin
deleted file mode 100644
index e289da7..0000000
Binary files a/templates/boot/isolinux/isolinux.bin and /dev/null differ
diff --git a/templates/boot/isolinux/vesamenu.c32 b/templates/boot/isolinux/vesamenu.c32
deleted file mode 100644
index 9bcc4f3..0000000
Binary files a/templates/boot/isolinux/vesamenu.c32 and /dev/null differ