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

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 1f255d6..a59a76a 100755 (executable)
--- 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
@@ -717,8 +724,13 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             cp -a /usr/lib/ipxe/ipxe.lkrn "${TEMPLATE_DIRECTORY}/boot/addons/"
             cp -a /usr/share/misc/pci.ids "${TEMPLATE_DIRECTORY}/boot/addons/"
             cp -a /boot/memtest86+.bin "${TEMPLATE_DIRECTORY}/boot/addons/memtest"
+            for file in memdisk chain.c32 hdt.c32 menu.c32; do
+              cp -a "/usr/lib/syslinux/${file}" "${TEMPLATE_DIRECTORY}/boot/addons/"
+            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