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

diff --git a/42_grml b/42_grml
index 7fc45ba..d84d169 100755 (executable)
--- 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
@@ -118,8 +125,13 @@ for grmliso in $iso_list ; do
   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/^/        /")
 
   sed -e "s/^/${submenu_indent}/" << EOF
 menuentry "${title}" {

diff --git a/debian/control b/debian/control
index 402399f..d371e64 100644 (file)
--- 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