X-Git-Url: http://git.grml.org/?p=grml-rescueboot.git;a=blobdiff_plain;f=42_grml;h=30f1c0758bc9c18ee256abf44e5b0a11037db1d3;hp=e30519fcfb7c7451ba584dce1cab3c35a8feb9ec;hb=700e01c3589c77af0f6bb3c0662ec6bd780c0f4b;hpb=3c6f08ebb2fed5859b17b04cd3b3209760fdcaf5

diff --git a/42_grml b/42_grml
index e30519f..30f1c07 100755
--- a/42_grml
+++ b/42_grml
@@ -1,8 +1,7 @@
 #!/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>
-# Bug-Reports:   see http://grml.org/bugs/
+# Authors:       Grml team (grml.org), (c) Andreas Gredler <jimmy@grml.org>, Michael Prokop <mika@grml.org>
 # License:       This file is licensed under the GPL v2+.
 ################################################################################
 
@@ -21,22 +20,95 @@ if [ -r /etc/default/grml-rescueboot ] ; then
   . /etc/default/grml-rescueboot
 fi
 
-list=$(for i in "${ISO_LOCATION}"/*.iso ; do
-         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-       done)
+resolve_dm_name() {
+  retval="$1"
+  base=${1##*/}
+  for block in /sys/block /sys/class/block ; do
+    [ ! -d ${block}/${base}/dm ] && continue
+    retval="/dev/mapper/$(cat ${block}/${base}/dm/name)"
+    break
+  done
+  case "$retval" in
+    /dev/dm-*)
+    minor=${retval##*-}
+   retval="/dev/mapper/$(dmsetup info -C --noheadings -o name -j 253 -m $minor)"
+    ;;
+  esac
 
-for grmliso in $list ; do
+  echo "$retval"
+}
+
+get_dependencies() {
+  device=${1}
+  if [ -z ${device} ] ; then
+    return
+  fi
+  device=$(readlink -f ${device})
+  case "$device" in
+    /dev/mapper/*)
+    device="/dev/dm-$(dmsetup info -C --noheadings -o minor "$device")"
+    ;;
+  esac
+
+  base=${device##*/}
+  dependencies=""
+  additional_dependencies=""
+  for block in /sys/block /sys/class/block ; do
+    [ ! -d ${block}/${base}/slaves ] && continue
+    for file in  ${block}/${base}/slaves/* ; do
+      dep_name="/dev/${file##*/}"
+      dep_name=$(resolve_dm_name ${dep_name})
+
+      # resolve recursively all dependencies
+      additional_dependencies=$(get_dependencies ${dep_name})
+
+      dependencies="$dependencies $additional_dependencies $dep_name"
+    done
+    break
+  done
+  echo $dependencies
+
+}
+
+
+
+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*)
+      dependencies=$(get_dependencies ${device})
+      dep_string=""
+      for dep in $dependencies $device ; do
+        dep_string="$dep_string,$dep"
+      done
+      dep_string=${dep_string#,}
+      additional_param="live-media=$dep_string"
+    ;;
+  esac
 
   echo "Found Grml ISO image: $grmliso" >&2
   title="Grml Rescue System ($grml)"
+  grub_prep=$(prepare_grub_to_access_device "$device" | sed -e "s/^/        /")
 
   cat << EOF
 menuentry "${title}" {
-$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/        /")
-        iso_path="${rel_dirname}/$grml $CUSTOM_BOOTOPTIONS"
+${grub_prep}
+        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