From: Michael Prokop <mika@grml.org>
Date: Fri, 15 Sep 2023 06:32:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/16'
X-Git-Tag: v0.6.1~1
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=55c158d6f6c60a1c606674a094898fee9fd8b0fc;hp=39d3762704c36881c15af83692c1957f2eddf859;p=grml-rescueboot.git

Merge remote-tracking branch 'origin/github/pr/16'
---

diff --git a/42_grml b/42_grml
index d84d169..7b96e6b 100755
--- a/42_grml
+++ b/42_grml
@@ -124,27 +124,33 @@ for grmliso in $iso_list ; do
     ;;
   esac
 
-  echo "Found Grml ISO image: $grmliso" >&2
+  echo "Found grml-rescueboot ISO image: ${grmliso}" >&2
   iso_id=$(get_iso_identifier "${grmliso}")
   if [ -n "${iso_id}" ] ; then
     title="${iso_id} (${grml})"
   else
-    title="Grml Rescue System (${grml})"
+    title="${grml}"
   fi
-  grub_prep=$(prepare_grub_to_access_device "$device" | sed -e "s/^/        /")
+  grub_prep=$(prepare_grub_to_access_device "${device}" | sed -e "s/^/${indent}/")
+  grub_iso_path="${rel_dirname%/}/${grml}"
 
   sed -e "s/^/${submenu_indent}/" << EOF
 menuentry "${title}" {
 ${grub_prep}
-        iso_path="${rel_dirname%/}/${grml}"
+        iso_path="${grub_iso_path}"
         export iso_path
         kernelopts=" $CUSTOM_BOOTOPTIONS $additional_param "
         export kernelopts
         # support booting recent GRUB versions on UEFI systems
+        # (see bugs.debian.org/959425)
         rmmod tpm
-        loopback loop "${rel_dirname%/}/$grml"
+        loopback loop "\$iso_path"
         set root=(loop)
         configfile /boot/grub/loopback.cfg
+        unset root
+        loopback -d loop
+        unset iso_path
+        unset kernelopts
 }
 EOF
 done