X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=backends%2Finitramfs-tools%2Flive.hook;h=89420b6fcdf223134a28834895f6b8f4ff9b4764;hb=c0b91e4572ddbbfa5da4e61bfd99ad20bc2f3dc1;hp=86ef1179005f605d30882e1479e75e36fefc4fb0;hpb=eb77833cf3f40583fe02dad42b667cc6b091f2c3;p=live-boot-grml.git

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 86ef117..89420b6 100755
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -6,19 +6,15 @@ set -e
 
 [ "${QUIET}" ] || echo -n "live-boot:"
 
-# Reading configuration files
-if [ -e /etc/live/boot.conf ]
-then
-	. /etc/live/boot.conf
-fi
-
-if ls /etc/live/boot.d/*.conf > /dev/null 2>&1
-then
-	for _FILE in /etc/live/boot.d/*.conf
-	do
-		. ${_FILE}
-	done
-fi
+# Reading configuration file from filesystem and live-media
+for _FILE in /etc/live/boot.conf /etc/live/boot/* \
+	     /live/image/live/boot.conf /live/image/live/boot/*
+do
+	if [ -e "${_FILE}" ]
+	then
+		. "${_FILE}"
+	fi
+done
 
 # Checking live-boot
 if [ ! -e /lib/live/boot ]