[SCM] live-initramfs branch, debian-next, updated. debian/1.199.1-1-15-g9cdc174

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 9cdc174db6ea6bc953dfb676ba21782977625322
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 1 12:57:48 2010 +0200

    Merging casper 1.214.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 8f23057..62fe922 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.214) lucid; urgency=low
+
+  * 15autologin: simplify the code with escape character evaluation
+    (LP: #505140)
+
+ -- Didier Roche <didrocks at ubuntu.com>  Tue, 12 Jan 2010 08:57:05 +0100
+
 casper (1.213) lucid; urgency=low
 
   * printf does not evaluate escape characters in the argument string.
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 0b80f84..a4df2df 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -66,15 +66,12 @@ TimedLoginDelay=10"
 
 	# Prevent from updating if parameters already present (persistent usb
 	# key)
-	if ! $(grep -qs 'AutomaticLoginEnable' $GDMCustomFile)
+	if ! $(grep -qs '\[daemon\]' $GDMCustomFile)
 	then
-		if $(grep -qs '\[daemon\]' $GDMCustomFile)
-		then
-			sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
-		else
-			printf "[daemon]\n$AutologinParameters" >> $GDMCustomFile
-		fi
+		echo '[daemon]' >> $GDMCustomFile
 	fi
+
+	sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
 fi
 
 if [ -d /root/etc/default/kdm.d/ ]

-- 
live-initramfs