[SCM] live-initramfs branch, debian, updated. debian/1.177.2-1-25-gd77466b
Daniel Baumann
daniel at debian.org
Fri Apr 30 17:27:47 UTC 2010
The following commit has been merged in the debian branch:
commit 2c4db9de146c73dd5a7edd5beaeb0bff96e67042
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 30 17:58:44 2010 +0200
Merging casper 1.180.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index d4add31..087984c 100644
--- 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 at 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
--- 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
--
live-initramfs
More information about the debian-live-changes
mailing list