diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 12:37:19 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | 0a3c8309519c152dcc313becc0389fdb10feac8c (patch) | |
| tree | 92eaeefa0e4252eb8958fe5779bac8eec5f3401f | |
| parent | f32a0232042e7579d78c1646d93fd68eec62aaa2 (diff) | |
| download | live-boot-0a3c8309519c152dcc313becc0389fdb10feac8c.tar.gz live-boot-0a3c8309519c152dcc313becc0389fdb10feac8c.zip | |
Merging casper 1.209.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/15autologin | 30 |
2 files changed, 18 insertions, 19 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 64a8d81..63b9148 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.209) lucid; urgency=low + + * Revert the previous change to 15autologin and instead just make sure + custom.conf does not exist. + + -- Evan Dandrea <evand@ubuntu.com> Mon, 04 Jan 2010 11:18:47 +0000 + casper (1.208) lucid; urgency=low [ Martin Pitt ] diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin index bee8d70..5bd9609 100755 --- a/scripts/live-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -55,26 +55,18 @@ then -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \ -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \ ${GDMCONF} -elif [ -d /root/etc/gdm3 ] +elif [ -d /root/etc/gdm3 ] && [ ! -e /root/etc/gdm3/custom.conf ] then - GDMCustomFile=/root/etc/gdm3/custom.conf - AutologinParameters="AutomaticLoginEnable=true\n\ -AutomaticLogin=$USERNAME\n\ -TimedLoginEnable=true\n\ -TimedLogin=$USERNAME\n\ -TimedLoginDelay=10" - - # Prevent from updating if parameters already present (persistent usb - # key) - if ! $(grep -qs 'AutomaticLoginEnable' $GDMCustomFile) - then - if $(grep -qs '\[daemon\]' $GDMCustomFile) - then - sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile - else - echo "[daemon]\n$AutologinParameters" >> $GDMCustomFile - fi - fi + +cat > /root/etc/gdm3/custom.conf << EOF +[daemon] +AutomaticLoginEnable=true +AutomaticLogin=$USERNAME +TimedLoginEnable=true +TimedLogin=$USERNAME +TimedLoginDelay=10 +EOF + fi if [ -d /root/etc/default/kdm.d/ ] |