X-Git-Url: https://git.grml.org/?p=grml-rescueboot.git;a=blobdiff_plain;f=42_grml;h=8c55863248ae9db52ac701b63bf10db2a59f35ff;hp=2a425c406c4dff7b08f489c9cf2ef21147a9f2e2;hb=1e7153d9b0746e3969856189987c70b82783a5c7;hpb=e59753ef8b5f772fc3fcee2380280813fb5f24cb

diff --git a/42_grml b/42_grml
index 2a425c4..8c55863 100755
--- a/42_grml
+++ b/42_grml
@@ -1,20 +1,29 @@
-#! /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>
 # Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
+# 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))"
@@ -24,13 +33,13 @@ for grmliso in $list ; do
   title="Grml Rescue System ($grml)"
 
   cat << EOF
-    menuentry "${title}" {
-    iso_path=${rel_dirname}/$grml
-    export iso_path
-    loopback loop \$iso_path
-    set root=(loop)
-    configfile /boot/grub/loopback.cfg
-    }
+menuentry "${title}" {
+        iso_path="${rel_dirname}/$grml $CUSTOM_BOOTOPTIONS"
+        export iso_path
+        loopback loop "${rel_dirname}/$grml"
+        set root=(loop)
+        configfile /boot/grub/loopback.cfg
+}
 EOF
 done