X-Git-Url: https://git.grml.org/?p=grml-rescueboot.git;a=blobdiff_plain;f=42_grml;h=8c55863248ae9db52ac701b63bf10db2a59f35ff;hp=4beb923930b071d710755a1c570ca014643535b9;hb=16b7201cc1d9dadaf0ccbbf1eebef3acb04481ab;hpb=712a0727190ebb8dcbdaf706e28ad450fb602b10

diff --git a/42_grml b/42_grml
index 4beb923..8c55863 100755
--- a/42_grml
+++ b/42_grml
@@ -1,20 +1,12 @@
-#! /bin/sh -e
-
-# grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
-#
-# GRUB is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GRUB is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+#!/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+.
+################################################################################
+
+set -e
 
 prefix=/usr
 exec_prefix=${prefix}
@@ -22,22 +14,33 @@ 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
-  echo "Found grml iso image: $grmliso" >&2
-  grml=`basename $grmliso`
+  rel_dirname="$(make_system_path_relative_to_its_root $(dirname $grmliso))"
+  grml="$(basename $grmliso)"
+
+  echo "Found Grml ISO image: $grmliso" >&2
   title="Grml Rescue System ($grml)"
 
   cat << EOF
-    menuentry "${title}" {
-    iso_path=$grmliso
-    export iso_path 
-    loopback loop $grmliso
-    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
+
+## END OF FILE #################################################################