From: Michael Prokop <mika@grml.org>
Date: Fri, 8 Sep 2023 08:59:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/14'
X-Git-Tag: v0.6.0~1
X-Git-Url: https://git.grml.org/?p=grml-rescueboot.git;a=commitdiff_plain;h=068c824b8154ed30be364cc6f4499c9a821fc1e4

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

068c824b8154ed30be364cc6f4499c9a821fc1e4
diff --cc 42_grml
index 7fc45ba,e8e8200..d84d169
--- a/42_grml
+++ b/42_grml
@@@ -118,10 -118,15 +125,15 @@@ for grmliso in $iso_list ; d
    esac
  
    echo "Found Grml ISO image: $grmliso" >&2
-   title="Grml Rescue System ($grml)"
-   grub_prep=$(prepare_grub_to_access_device "${device}" | sed -e "s/^/${indent}/")
+   iso_id=$(get_iso_identifier "${grmliso}")
+   if [ -n "${iso_id}" ] ; then
+     title="${iso_id} (${grml})"
+   else
+     title="Grml Rescue System (${grml})"
+   fi
+   grub_prep=$(prepare_grub_to_access_device "$device" | sed -e "s/^/        /")
  
 -  cat << EOF
 +  sed -e "s/^/${submenu_indent}/" << EOF
  menuentry "${title}" {
  ${grub_prep}
          iso_path="${rel_dirname%/}/${grml}"