[SCM] live-config branch, debian-next, updated. debian/3.0_a37-1-2-g07f78e1

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 07f78e12ce29ab388d51ff70c12cb38e371fa9c7
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Apr 30 17:30:02 2012 +0000

    Simplyfing reading of configuration files.

diff --git a/scripts/config.sh b/scripts/config.sh
index 7eedcf9..270973b 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -167,33 +167,15 @@ Main ()
 	echo -n "live-config:"
 	trap 'Trap' EXIT HUP INT QUIT TERM
 
-	# Reading configuration file from filesystem
-	if [ -e /etc/live/config.conf ]
-	then
-		. /etc/live/config.conf
-	fi
-
-	if ls /etc/live/config.d/*.conf > /dev/null 2>&1
-	then
-		for _FILE in /etc/live/config.d/*.conf
-		do
-			. ${_FILE}
-		done
-	fi
-
-	# Reading configuration file from live-media
-	if [ -e /live/image/live/config.conf ]
-	then
-		. /live/image/live/config.conf
-	fi
-
-	if ls /live/image/live/config.d/*.conf > /dev/null 2>&1
-	then
-		for _FILE in /live/image/live/config.d/*.conf
-		do
-			. ${_FILE}
-		done
-	fi
+	# Reading configuration file from filesystem and live-media
+	for _FILE in /etc/live/config.conf /etc/live/config.d/*.conf \
+		     /live/image/live/config.conf /live/image/live/config.d/*.conf
+	do
+		if [ -e "${_FILE}" ]
+		then
+			. "${_FILE}"
+		fi
+	done
 
 	# Reading kernel command line
 	Cmdline

-- 
live-config