From 517bcbd5fe394c658e2b6539882535bcd711f146 Mon Sep 17 00:00:00 2001 From: Daniel Richard G Date: Fri, 7 Apr 2023 00:07:46 -0400 Subject: [PATCH] Try using isoinfo(1) to extract an ISO image identifier --- 42_grml | 18 +++++++++++++++--- debian/control | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/42_grml b/42_grml index b951465..e8e8200 100755 --- a/42_grml +++ b/42_grml @@ -74,10 +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 @@ -111,7 +118,12 @@ for grmliso in $iso_list ; do esac echo "Found Grml ISO image: $grmliso" >&2 - title="Grml Rescue System ($grml)" + 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 diff --git a/debian/control b/debian/control index 402399f..d371e64 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Depends: ${shlibs:Depends}, Recommends: debian-keyring, + genisoimage, gpgv, wget, Description: Integrates Grml ISO booting into GRUB -- 2.1.4