X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F45-grub-images;h=7b66dcb95901109994037a70e52769fdbfae2041;hb=55a97d8c555e1b6ebc96ae08833bf30acbb8a60e;hp=56e06197ecfb65cefa2fccd5de7d0fea5a0f2433;hpb=bf8e3bc45b72c51386b53da9fe5acae2703b6e41;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images
index 56e0619..7b66dcb 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}}"
@@ -37,7 +35,7 @@ ADDITIONAL_MODULES[i386-pc]="biosdisk"
 if ifclass AMD64 ; then
   if [ -r "${target}"/usr/lib/grub/x86_64-efi/moddep.lst ] ; then
     ARCHS+=(x86_64-efi)
-    ADDITIONAL_MODULES[x86_64-efi]="efi_gop efi_uga linux16"
+    ADDITIONAL_MODULES[x86_64-efi]="efi_gop efi_uga"
   else
     echo "/usr/lib/grub/x86_64-efi/moddep.lst could not be found, skipping."
     echo "NOTE: grub-efi-amd64-bin not installed?"
@@ -50,11 +48,9 @@ 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 raid regexp reiserfs search search_fs_file search_fs_uuid  \
-  search_label squash4 terminal test video videoinfo xfs ${ADDITIONAL_MODULES[$arch]}
+  echo iso9660 part_msdos search_fs_file test \
+  fat ext2 reiserfs xfs btrfs squash4 part_gpt lvm \
+  ${ADDITIONAL_MODULES[$arch]}
 done
 
 if [ -f "${target}/boot/i386-pc.img" ] ; then
@@ -71,7 +67,7 @@ if ifclass AMD64 ; then
     exit 1
   fi
 
-  SIZE=$(du -sk "${target}/${BOOTX64}" | awk -F" " '{print $1'})
+  SIZE=$(du --apparent-size -sk "${target}/${BOOTX64}" | awk -F" " '{print $1}')
   SIZE=$(((($SIZE / 32 )+2)*32))
 
   dd if=/dev/zero of="${target}/${EFI_IMG}" bs=1k count="$SIZE" 2>/dev/null