X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=b7d59b451c58a7fb3036c86ecc04b077733aa5c8;hb=560e0f3ee42e52a2d4e10e1749d4cee7adf1a691;hp=9e35a3db574208be12950b2a4c9e419642ec9975;hpb=990cf8d17f517f619e9c3887e60a4e3d19f70583;p=grml-live.git

diff --git a/grml-live b/grml-live
index 9e35a3d..b7d59b4 100755
--- a/grml-live
+++ b/grml-live
@@ -24,7 +24,7 @@ fi
 # set -e
 
 # global variables
-GRML_LIVE_VERSION='0.15.0'
+GRML_LIVE_VERSION='0.15.1'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ADDONS_LIST_FILE='/boot/isolinux/addons_list.cfg'
@@ -738,7 +738,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
@@ -861,7 +867,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           log 'Using console based isolinux method as requested via $ISOLINUX_METHOD.'
           einfo 'Using console based isolinux method as requested via $ISOLINUX_METHOD.'
           if grep -q '^include console.cfg' "${BUILD_OUTPUT}/boot/isolinux/distri.cfg" ; then
-            einfo "include for console.cfg already foud, nothing to do."
+            einfo "include for console.cfg already found, nothing to do."
             eend 0
           else
             log "including console.cfg in ${BUILD_OUTPUT}/boot/isolinux/isolinux.cfg"
@@ -872,7 +878,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
        else
           log 'Using graphical boot menu.'
           if grep -q '^include vesamenu.cfg' "${BUILD_OUTPUT}/boot/isolinux/isolinux.cfg" ; then
-            log "include for vesamenu.cfg already foud, nothing to do."
+            log "include for vesamenu.cfg already found, nothing to do."
           else
             log "including vesamenu.cfg in ${BUILD_OUTPUT}/boot/isolinux/isolinux.cfg"
             echo "include vesamenu.cfg" >> "${BUILD_OUTPUT}/boot/isolinux/isolinux.cfg"