[SCM] live-boot branch, debian-next, updated. debian/3.0_a38-1-12-g6f81ca9

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6f81ca95930688ac8fc9fb7409f91015083fc832
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 20:51:32 2012 +0200

    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 ]

-- 
live-boot