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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit aabc29628c3e2136ced34ce2475a619b914f3b6e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 29 12:09:04 2010 +0200

    Also accept live-config.noroot.

diff --git a/scripts/config.sh b/scripts/config.sh
index 7b21a55..58d34de 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -67,7 +67,7 @@ Cmdline ()
 				;;
 
 			# Shortcuts
-			noroot)
+			live-config.noroot|noroot)
 				# Disable root access, no matter what mechanism
 				SCRIPTS="${SCRIPTS:-$(ls /lib/live/config/*)}"
 				NOCONFIGS="${NOCONFIGS},sudo,policykit"

-- 
live-config