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/?a=commitdiff_plain;h=068c824b8154ed30be364cc6f4499c9a821fc1e4;hp=-c;p=grml-rescueboot.git

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

068c824b8154ed30be364cc6f4499c9a821fc1e4
diff --combined 42_grml
index 7fc45ba,e8e8200..d84d169
--- a/42_grml
+++ b/42_grml
@@@ -74,10 -74,17 +74,17 @@@ get_dependencies() 
      break
    done
    echo $dependencies
- 
  }
  
- 
+ get_iso_identifier() {
+   local iso="$1"
+   local id=
+   if isoinfo --version >/dev/null 2>&1 ; then
+     id=$(isoinfo -d -i "${iso}" | grep '^Volume id:' | sed -e 's/^[^:]*: *//')
+     [ -n "${id}" ] || id=$(isoinfo -d -i "${iso}" | grep '^Application id:' | sed -e 's/^[^:]*: *//')
+   fi
+   echo "${id}"
+ }
  
  iso_list=""
  for file in "${ISO_LOCATION}"/*.iso ; do
@@@ -86,13 -93,6 +93,13 @@@
       fi
  done
  
 +indent='        '
 +submenu_indent=
 +if [ -n "${GRUB_SUBMENU}" ] && [ -n "${iso_list}" ] ; then
 +  echo "submenu \"${GRUB_SUBMENU}\" \$menuentry_id_option \"grml-rescueboot\" {"
 +  submenu_indent="${indent}"
 +fi
 +
  for grmliso in $iso_list ; do
    rel_dirname="$(dirname $(make_system_path_relative_to_its_root $grmliso))"
    grml="$(basename $grmliso)"
@@@ -118,10 -118,15 +125,15 @@@
    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}"
@@@ -137,8 -142,4 +149,8 @@@
  EOF
  done
  
 +if [ -n "${GRUB_SUBMENU}" ] && [ -n "${iso_list}" ] ; then
 +  echo "} # end submenu \"${GRUB_SUBMENU}\""
 +fi
 +
  ## END OF FILE #################################################################