From: Michael Schierl <schierlm@gmx.de>
Date: Wed, 26 Mar 2014 19:39:32 +0000 (+0100)
Subject: Make the GRUB images modular
X-Git-Tag: v0.23.2~4^2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=d3e8ff25fa98d39f794af4c8c151ca17f110bc6b;hp=-c

Make the GRUB images modular

Now, both the i386-pc and the amd64 UEFI GRUB images are modular.
This means, that startup is faster and that all modules (even those
that cannot be embedded) can be used.

The embedded configfile has been simplified since conditionals are not
supported by the simple command parser of the rescue shell, without
sacrificing any functionality.

Also, the main build script now copies the *.mod and *.lst files for
UEFI GRUB to the ISO.

[My statement that the .lst files are no longer needed was wrong; at
least the command.lst is used for autoloading modules that have
different names than their commands.]
---

d3e8ff25fa98d39f794af4c8c151ca17f110bc6b
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images
index 6dfbf58..5541da6 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images
+++ b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images
@@ -16,13 +16,11 @@ TMP_CONFIG="${target}/tmp/grub_config_efi"
 rm -f "$BOOTX64" "$EFI_IMG" "$TMP_CONFIG"
 
 cat > "$TMP_CONFIG" <<EOF
-search --set -f /conf/bootid.txt root
-if [ -e /boot/grub/grub.cfg ]; then
- set prefix=(\$root)/boot/grub
- configfile /boot/grub/grub.cfg
-else
- echo "E: Could not find root device!"
-fi
+search.file /conf/bootid.txt root
+set prefix=(\$root)/boot/grub
+insmod normal
+normal
+echo "E: Could not find root device!"
 EOF
 
 BOOTX64="${BOOTX64##${target}}"
@@ -44,30 +42,14 @@ if ifclass AMD64 ; then
   fi
 fi
 
-# until grub 1.99-27.1 it's called raid, starting with
-# grub version 2.00-14 the raid.mod module no longer exists
-if [ -r "${target}"/usr/lib/grub/i386-pc/raid.mod ] ; then
-  echo "Using raid module as file raid.mod is present"
-  ADDITIONAL_MODULES[raid]="raid"
-elif [ -r "${target}"/usr/lib/grub/i386-pc/diskfilter.mod ] ; then
-  echo "Using diskfilter and related modules as file diskfilter.mod is present"
-  ADDITIONAL_MODULES[raid]="diskfilter mdraid09 mdraid09_be mdraid1x raid5rec raid6rec"
-else
-  echo "Warning: no according raid module in grub directory found."
-fi
-
 BOOTX64="${BOOTX64##${target}}"
 EFI_IMG="${EFI_IMG##${target}}"
 TMP_CONFIG="${TMP_CONFIG##${target}}"
 
 for arch in ${ARCHS[@]} ; do
 $ROOTCMD grub-mkimage -O $arch -o /boot/$arch.img --prefix=/boot/grub/ --config="$TMP_CONFIG" \
-  bitmap boot btrfs cat chain cmp configfile cpio echo elf ext2    \
-  fat gfxmenu gfxterm gzio help iso9660 jpeg linux loopback lvm    \
-  memdisk minicmd multiboot normal part_gpt part_msdos play png    \
-  probe regexp reiserfs search search_fs_file search_fs_uuid       \
-  search_label squash4 terminal test video videoinfo xfs           \
-  ${ADDITIONAL_MODULES[raid]} ${ADDITIONAL_MODULES[$arch]}
+  echo iso9660 part_msdos search_fs_file test \
+  ${ADDITIONAL_MODULES[$arch]}
 done
 
 if [ -f "${target}/boot/i386-pc.img" ] ; then
diff --git a/grml-live b/grml-live
index b470d41..b629c12 100755
--- a/grml-live
+++ b/grml-live
@@ -966,6 +966,10 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
        cp -a "${CHROOT_OUTPUT}"/boot/grub/core.img "${BUILD_OUTPUT}"/boot/grub/
        cp -a "${CHROOT_OUTPUT}"/boot/grub/grub.img "${BUILD_OUTPUT}"/boot/grub/
 
+       # copy modules for UEFI grub
+       mkdir -p "${BUILD_OUTPUT}"/boot/grub/x86_64-efi/
+       cp -a "${CHROOT_OUTPUT}"/usr/lib/grub/x86_64-efi/*.{mod,lst} "${BUILD_OUTPUT}"/boot/grub/x86_64-efi/
+
        if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then
           log    "Error: ${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting."
           eerror "Error: ${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting." ; eend 1