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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 67853178ea148fb146b417b335252258233c9e10
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 20:50:43 2012 +0200

    Reading configuration file from filesystem and live-media at runtime too.

diff --git a/scripts/boot.sh b/scripts/boot.sh
index c031f00..11e8094 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -2,6 +2,16 @@
 
 # set -e
 
+# 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
+
 for _SCRIPT in /lib/live/boot/????-*
 do
 	if [ -e "${_SCRIPT}" ]

-- 
live-boot