From cbb6227ade1de762001ff72d12c28c8da416a9eb Mon Sep 17 00:00:00 2001
From: Daniel Richard G <skunk@iSKUNK.ORG>
Date: Tue, 12 Sep 2023 23:19:53 -0400
Subject: [PATCH] Minor tweaks to terminal output, variables, and GRUB stanza

* Print `Found grml-rescueboot ISO image:` instead of `Found Grml ISO
  image:` as the latter implies that the ISO image comes from Grml,
  whereas the former is more to the point of "grml-rescueboot found this
  image";

* Similarly, just print the ISO filename as the title, as "Grml Rescue
  System" implies that the ISO is the actual Grml rescue system;

* Use the existing `${indent}` variable instead of another eight spaces;

* Store `"${rel_dirname%/}/${grml}"` in a variable, as it is likely to
  be needed more than once;

* Add Debian bug reference for the `tpm` issue, as it is difficult for
  the user to understand otherwise;

* Use the existing GRUB variable to set the loopback path;

* Perform cleanup after exiting the ISO loopback menu.
---
 42_grml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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
-- 
2.1.4