X-Git-Url: https://git.grml.org/?p=grml-rescueboot.git;a=blobdiff_plain;f=42_grml;h=69f4b96b5ac1dc5278a48e36e82dba26db7b620e;hp=b02596923de4491d8f3bb9bef94faf651a338105;hb=5361a30d7097df019c4b5cf8dcef84593dafc906;hpb=e14cf6bdbc2546e5ee19190c8cab3cd5fd41bf26

diff --git a/42_grml b/42_grml
index b025969..69f4b96 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,20 +6,25 @@
 # 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
 
+list=$(for i in "${ISO_LOCATION}"/*.iso ; do
+         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+       done)
+
 for grmliso in $list ; do
   rel_dirname="$(make_system_path_relative_to_its_root $(dirname $grmliso))"
   grml="$(basename $grmliso)"
@@ -29,8 +34,11 @@ for grmliso in $list ; do
 
   cat << EOF
 menuentry "${title}" {
-        iso_path="${rel_dirname}/$grml $CUSTOM_BOOTOPTIONS"
+$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/        /")
+        iso_path="${rel_dirname}/${grml}"
         export iso_path
+        kernelopts="$CUSTOM_BOOTOPTIONS"
+        export kernelopts
         loopback loop "${rel_dirname}/$grml"
         set root=(loop)
         configfile /boot/grub/loopback.cfg