[SCM] live-config branch, debian-next, updated. debian/2.0_a8-1-3-g185a54e

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 185a54ef13833c2b56ed8287b0c429065ed46e4e
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jun 10 18:44:04 2010 +0200

    Correcting nodm script.

diff --git a/scripts/config/010-nodm b/scripts/config/010-nodm
index 164a33d..599ab4b 100755
--- a/scripts/config/010-nodm
+++ b/scripts/config/010-nodm
@@ -24,6 +24,10 @@ Nodm ()
 
 Configure_nodm ()
 {
+	# autologin
+	sed -i -r -e "s|^NODM_ENABLED=.*\$|NODM_ENABLED=true|" \
+		  -e "s|^NODM_USER=.*\$|NODM_USER=${LIVE_USERNAME}|" \
+	/etc/default/nodm
 
 cat > /tmp/debconf.live << EOF
 nodm nodm/enabled boolean true
@@ -33,8 +37,6 @@ EOF
 	debconf-set-selections < /tmp/debconf.live
 	rm -f /tmp/debconf.live
 
-	dpkg-reconfigure -f non-interactive -p critical nodm
-
 	# Creating state file
 	touch /var/lib/live/config/nodm
 }

-- 
live-config