Merging casper 1.179.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 533fd20..d4add31 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,14 @@
+casper (1.179) karmic; urgency=low
+
+  [ Colin Watson ]
+  * If LIVE_MEDIA_PATH is set on the command line, record it in
+    /etc/casper.conf for the benefit of ubiquity.
+
+  [ Martin Pitt ]
+  * scripts/casper-bottom/15autologin: Update to work with new gdm.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 03 Jul 2009 14:51:57 +0200
+
 casper (1.178) karmic; urgency=low
 
   * Ensure that unionfs-fuse isn't killed by /etc/init.d/sendsigs on

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