X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=42_grml;h=d84d1690ca5a5183604f2d164b236afbf156da5b;hb=068c824b8154ed30be364cc6f4499c9a821fc1e4;hp=b951465ed41133c30c1c185c623471e606bce989;hpb=35e968ccac91c57e1f0353804621e048adbab5ee;p=grml-rescueboot.git

diff --git a/42_grml b/42_grml
index b951465..d84d169 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
@@ -86,6 +93,13 @@ for file in "${ISO_LOCATION}"/*.iso ; do
      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)"
@@ -111,10 +125,15 @@ 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
+  sed -e "s/^/${submenu_indent}/" << EOF
 menuentry "${title}" {
 ${grub_prep}
         iso_path="${rel_dirname%/}/${grml}"
@@ -130,4 +149,8 @@ ${grub_prep}
 EOF
 done
 
+if [ -n "${GRUB_SUBMENU}" ] && [ -n "${iso_list}" ] ; then
+  echo "} # end submenu \"${GRUB_SUBMENU}\""
+fi
+
 ## END OF FILE #################################################################