[SCM] live-config branch, debian-next, updated. debian/2.0_a2-1-1-g39be0bf

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 39be0bf57fda53261dbef0b66194a0e080b85bff
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri May 28 07:31:18 2010 +0200

    Removing fixme note about configuration filename.

diff --git a/scripts/config.sh b/scripts/config.sh
index 28ef61d..652baaf 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -95,7 +95,7 @@ Main ()
 	echo -n "live-config:"
 	trap 'Trap' EXIT HUP INT QUIT TERM
 
-	# Reading configuration file from filesystem (FIXME: needs better name)
+	# Reading configuration file from filesystem
 	if [ -e /etc/live/config.conf ]
 	then
 		. /etc/live/config.conf
@@ -109,7 +109,7 @@ Main ()
 		done
 	fi
 
-	# Reading configuration file from live-media (FIXME: needs better name)
+	# Reading configuration file from live-media
 	if [ -e /live/image/live/config.conf ]
 	then
 		. /live/image/live/config.conf

-- 
live-config