Merge initramfs scripts

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 45-efi

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/45-efi b/etc/grml/fai/config/scripts/GRMLBASE/45-efi
index f9ec40d..eef55da 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/45-efi
+++ b/etc/grml/fai/config/scripts/GRMLBASE/45-efi
@@ -30,8 +30,7 @@ rm -f "$GRUB_EFI_IMAGE" "$TMP_CONFIG" "$EFI_IMAGE"
 cat > "$TMP_CONFIG" <<EOF
 search --set -f /conf/bootid.txt root
 if [ -e /boot/grub/grub.cfg ]; then
- set prefix=\$root/boot/grub
- load_video
+ set prefix=(\$root)/boot/grub
  configfile /boot/grub/grub.cfg
 else
  echo "E: Could not find root device!"
@@ -47,7 +46,7 @@ $ROOTCMD grub-mkimage -O x86_64-efi -o "$GRUB_EFI_IMAGE" --prefix=/boot/grub/ --
   efi_uga elf ext2 fat gfxmenu gfxterm gzio help iso9660 jpeg linux \
   loopback lvm minicmd multiboot normal part_gpt part_msdos png     \
   probe raid reiserfs search search_fs_file search_fs_uuid          \
-  search_label terminal test video videoinfo xfs
+  search_label squash4 terminal test video videoinfo xfs
 
 if ! [ -r "${target}/${GRUB_EFI_IMAGE}" ] ; then
   echo "Can not access grub efi image." >&2