X-Git-Url: http://git.grml.org/?p=grml-rescueboot.git;a=blobdiff_plain;f=42_grml;h=6e82b903e575105432395f91d291a1df184edb48;hp=b02596923de4491d8f3bb9bef94faf651a338105;hb=ddd62509fdc15ce4ce998374c903f279943b7631;hpb=e14cf6bdbc2546e5ee19190c8cab3cd5fd41bf26

diff --git a/42_grml b/42_grml
index b025969..6e82b90 100755
--- a/42_grml
+++ b/42_grml
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#!/bin/sh
 # Filename:      42_grml
 # Purpose:       grub-mkconfig helper script for Grml rescue systems
 # Authors:       grml-team (grml.org), (c) Andreas Gredler <jimmy@grml.org>, Michael Prokop <mika@grml.org>
@@ -6,31 +6,51 @@
 # License:       This file is licensed under the GPL v2+.
 ################################################################################
 
+set -e
+
 prefix=/usr
 exec_prefix=${prefix}
 bindir=${exec_prefix}/bin
 libdir=${exec_prefix}/lib
 . ${libdir}/grub/grub-mkconfig_lib
 
-list=$(for i in /boot/grml/*.iso ; do
-        if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-      done)
+# default unless configured otherwise:
+ISO_LOCATION="/boot/grml"
 
 if [ -r /etc/default/grml-rescueboot ] ; then
   . /etc/default/grml-rescueboot
 fi
 
-for grmliso in $list ; do
+iso_list=""
+for file in "${ISO_LOCATION}"/*.iso ; do
+     if grub_file_is_not_garbage "$file" ; then
+       iso_list="$iso_list $file "
+     fi
+done
+
+for grmliso in $iso_list ; do
   rel_dirname="$(make_system_path_relative_to_its_root $(dirname $grmliso))"
   grml="$(basename $grmliso)"
+  device="$(${grub_probe} -t device ${grmliso})"
+
+  additional_param=""
+
+  case "$device" in
+      /dev/mapper*|/dev/md*)
+      additional_param="live-media=$device"
+      ;;
+  esac
 
   echo "Found Grml ISO image: $grmliso" >&2
   title="Grml Rescue System ($grml)"
 
   cat << EOF
 menuentry "${title}" {
-        iso_path="${rel_dirname}/$grml $CUSTOM_BOOTOPTIONS"
+$(prepare_grub_to_access_device "$device" | sed -e "s/^/        /")
+        iso_path="${rel_dirname}/${grml}"
         export iso_path
+        kernelopts=" $CUSTOM_BOOTOPTIONS $additional_param "
+        export kernelopts
         loopback loop "${rel_dirname}/$grml"
         set root=(loop)
         configfile /boot/grub/loopback.cfg