Merging casper 1.180.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index d4add31..087984c 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,14 @@
+casper (1.180) karmic; urgency=low
+
+  [ Colin Watson ]
+  * scripts/casper-bottom/15autologin: Minor consistency fixes.
+
+  [ Martin Pitt ]
+  * scripts/casper-bottom/15autologin: Update for new gdm custom configuration
+    file (/etc/gdm/custom.conf). (LP: #395861)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 06 Jul 2009 16:40:00 +0200
+
 casper (1.179) karmic; urgency=low
 
   [ Colin Watson ]

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index dd66a83..3f85d50 100755 (executable)
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -55,10 +55,10 @@ then
               -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
               -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
        ${GDMCONF}
-elif [ -e /root/etc/gdm3 ]
+elif [ -d /root/etc/gdm3 ]
 then
 
-cat > /root/etc/gdm3/daemon.conf << EOF
+cat > /root/etc/gdm3/custom.conf << EOF
 [daemon]
 AutomaticLoginEnable=true
 AutomaticLogin=$USERNAME