From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 May 2010 10:57:48 +0000 (+0200)
Subject: Merging casper 1.214.
X-Git-Tag: debian/2.0.15-1~151
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=79ca08a0ac2217563692e9182d9e636998428ba0;p=live-boot-grml.git

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@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/ ]