X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=21c84341fdec15d855731a257bde6f1553fad5aa;hb=bd64a68280151ed3807d5f974a26ac04ef64a654;hp=695ea2aa1ec3c11d734eab7c92cd9e97c78a9509;hpb=905546a8ede881391cb26fa2c392d150d720c400;p=grml-live-grml.git

diff --git a/grml-live b/grml-live
index 695ea2a..21c8434 100755
--- a/grml-live
+++ b/grml-live
@@ -713,6 +713,10 @@ 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/"
+
             # copy only files so we can handle bsd4grml on its own
             for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
               test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/
@@ -738,7 +742,13 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           ewarn "grub templates do not exist, skipping therefore." ; eend 0
        else
           if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
-             cp -a ${TEMPLATE_DIRECTORY}/boot/grub  "$BUILD_OUTPUT"/boot/
+            mkdir -p "${BUILD_OUTPUT}/boot/grub"
+            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 \
+              "${BUILD_OUTPUT}/boot/grub/core.img" biosdisk iso9660 --format=i386-pc
           fi
 
           # make sure we have recent template files available, otherwise updating
@@ -879,38 +889,10 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           fi
        fi
 
-       # jump back to grub from bsd4grml (/boot/grub/stage2):
-       GRUB_LEGACY=stage2
-
        if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then
-          if [ -e "$BUILD_OUTPUT"/boot/grub/core.img ]; then
-             GRUB_VERSION=2
-          else
-             GRUB_VERSION=1
-          fi
-
-          for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \
-                      "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg \
-                      "$BUILD_OUTPUT"/boot/isolinux/*.cfg \
-                      "$BUILD_OUTPUT"/boot/grub/grub.cfg \
-                      "$BUILD_OUTPUT"/boot/grub/menu.lst ; do
-              if [ -e "$file" ] ; then
-                sed -i -e "s!%GRUB_VERSION%!$GRUB_VERSION!g" \
-                       -e "s!%GRUB_LEGACY%!$GRUB_LEGACY!g" "$file"
-              fi
-          done
-
           sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6
        fi
 
-       if [ -e "$BUILD_OUTPUT"/boot/grub/$GRUB_LEGACY ]; then
-          sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/menu.lst
-          sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/grub.cfg
-       elif [ -e "$BUILD_OUTPUT"/boot/grub/menu.lst -a -e "$BUILD_OUTPUT"/boot/grub/grub.cfg ] ; then
-          sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/menu.lst
-          sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/grub.cfg
-       fi
-
        DPKG_LIST="/var/log/fai/$HOSTNAME/last/dpkg.list" # the dpkg --list output of the chroot
        if ! [ -r "$DPKG_LIST" ] ; then
           ewarn "$DPKG_LIST could not be read, ignoring to store package information on ISO therefore."
@@ -1038,8 +1020,6 @@ fi
 
 if [ "$BOOT_METHOD" = "isolinux" ] ; then
    BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
-elif [ "$BOOT_METHOD" = "grub" ] ; then
-   BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/grub/stage2"
 elif [ "$BOOT_METHOD" = "grub2" ] ; then
    BOOT_ARGS="-no-emul-boot -boot-load-size 4 -b boot/grub/toriboot.bin"
 fi