From: Daniel Baumann <daniel@debian.org>
Date: Tue, 14 Aug 2012 18:51:32 +0000 (+0200)
Subject: Reading configuration files in initramfs-tools hook too.
X-Git-Tag: debian/3.0_b1-1~5
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=6f81ca95930688ac8fc9fb7409f91015083fc832;p=live-boot-grml.git

Reading configuration files in initramfs-tools hook too.
---

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 00da049..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/* > /dev/null 2>&1
-then
-	for _FILE in /etc/live/boot/*
-	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 ]