diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 12:52:27 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | 1bad81c0450e84a94dc1d5f4ead9886f15749b80 (patch) | |
| tree | e95a7ef1d08acb6b14ab66170f0e3a139b86e8b1 | |
| parent | a3e443f92f8cab935004c280c24b147a2fd0a9df (diff) | |
| download | live-boot-1bad81c0450e84a94dc1d5f4ead9886f15749b80.tar.gz live-boot-1bad81c0450e84a94dc1d5f4ead9886f15749b80.zip | |
Merging casper 1.211.
| -rw-r--r-- | docs/ChangeLog.casper | 10 | ||||
| -rwxr-xr-x | scripts/live-bottom/15autologin | 30 |
2 files changed, 29 insertions, 11 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 41f1c6f..d240eb8 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,13 @@ +casper (1.211) lucid; urgency=low + + * Readd scripts/casper-bottom/15autologin changes: derivatives have + now a custom.conf file and still need autologin in live version. + Merge with my previous fix proposed for sponsoring one week ago: + use echo -e to enable \n interpretation (/bin/sh is busybox ash + which behavior differs from vanilla ash interpretor) (LP: #500786)ยท + + -- Didier Roche <didrocks@ubuntu.com> Tue, 05 Jan 2010 20:05:26 +0100 + casper (1.210) lucid; urgency=low [ Scott James Remnant ] diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin index 5bd9609..2758c95 100755 --- a/scripts/live-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -55,18 +55,26 @@ then -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \ -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \ ${GDMCONF} -elif [ -d /root/etc/gdm3 ] && [ ! -e /root/etc/gdm3/custom.conf ] +elif [ -d /root/etc/gdm3 ] then - -cat > /root/etc/gdm3/custom.conf << EOF -[daemon] -AutomaticLoginEnable=true -AutomaticLogin=$USERNAME -TimedLoginEnable=true -TimedLogin=$USERNAME -TimedLoginDelay=10 -EOF - + 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 -e "[daemon]\n$AutologinParameters" >> $GDMCustomFile + fi + fi fi if [ -d /root/etc/default/kdm.d/ ] |