X-Git-Url: https://git.grml.org/?p=grml-rescueboot.git;a=blobdiff_plain;f=42_grml;h=4a7643225bd576033364a78ca4d7ba3823ec0a36;hp=8cfdb3fecf4b12f5b090a2a23670851cbb7e5d18;hb=1f30a2c0f64dd0d5780e2756fa0b92f1aaaea2b5;hpb=961213e06435d39dbe735412b0571591dfd52d80

diff --git a/42_grml b/42_grml
index 8cfdb3f..4a76432 100755
--- a/42_grml
+++ b/42_grml
@@ -87,7 +87,7 @@ for file in "${ISO_LOCATION}"/*.iso ; do
 done
 
 for grmliso in $iso_list ; do
-  rel_dirname="$(make_system_path_relative_to_its_root $(dirname $grmliso))"
+  rel_dirname="$(dirname $(make_system_path_relative_to_its_root $grmliso))"
   grml="$(basename $grmliso)"
   device="$(${grub_probe} -t device ${grmliso})"
 
@@ -112,11 +112,13 @@ for grmliso in $iso_list ; do
   cat << EOF
 menuentry "${title}" {
 ${grub_prep}
-        iso_path="${rel_dirname}/${grml}"
+        iso_path="${rel_dirname%/}/${grml}"
         export iso_path
         kernelopts=" $CUSTOM_BOOTOPTIONS $additional_param "
         export kernelopts
-        loopback loop "${rel_dirname}/$grml"
+        # support booting recent GRUB versions on UEFI systems
+        rmmod tpm
+        loopback loop "${rel_dirname%/}/$grml"
         set root=(loop)
         configfile /boot/grub/loopback.cfg
 }