X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=a59a76a6bf71ef9bae10ef3e965404a2dd01f7c7;hb=9c238dcb3971aa7a27e68b556e94b98c35966cac;hp=2369cacd2425288a9156d15aacc3f4ad2591e353;hpb=bfbf9fb3562addb5d17657a511e28933b7b33e4d;p=grml-live.git

diff --git a/grml-live b/grml-live
index 2369cac..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
@@ -713,7 +720,17 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             log   "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)"
             ewarn "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)" ; eend 0
           else
+            # copy addons from Depended packages
+            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