[SCM] live-config branch, debian-next, updated. debian/3.0_a14-1-12-g1f5d326

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 1f5d326dc2f839858cf752376c4dbcadd263e835
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 6 17:08:31 2010 +0100

    Avoid twice accessing /proc/cmdline in main script.

diff --git a/scripts/config.sh b/scripts/config.sh
index 2e20ef1..0f7557a 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -27,8 +27,6 @@ LIVE_HOSTNAME="debian"
 LIVE_USERNAME="user"
 LIVE_USER_FULLNAME="Debian Live user"
 
-_CMDLINE="$(cat /proc/cmdline)"
-
 Cmdline ()
 {
 	for _PARAMETER in ${_CMDLINE}
@@ -147,7 +145,9 @@ Start_network ()
 
 Main ()
 {
-	if ! grep -qs "boot=live" /proc/cmdline
+	_CMDLINE="$(cat /proc/cmdline)"
+
+	if ! echo ${_CMDLINE} | grep -qs "boot=live"
 	then
 		exit 0
 	fi

-- 
live-config