+casper (1.208) lucid; urgency=low
+
+ [ Martin Pitt ]
+ * scripts/casper-bottom/25configure_init: sreadahead is no more, disable
+ ureadahead instead.
+
+ [ Didier Roche ]
+ * scripts/casper-bottom/15autologin: Don't erase /etc/gdm/custom.conf but
+ only append autologin on casper startup if needed. This avoids removing
+ default session set in this file for ubuntu derivatives which use GDM.
+ The script also check if the modification is already there for
+ persistent usb keys. (LP: #498971)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 21 Dec 2009 15:54:36 +0100
+
casper (1.207) lucid; urgency=low
* Drop 46_disable_services. It didn't need to be running on "all" systems
${GDMCONF}
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 "[daemon]\n$AutologinParameters" >> $GDMCustomFile
+ fi
+ fi
fi
if [ -d /root/etc/default/kdm.d/ ]
chmod -x /root/sbin/readahead-list
fi
-# Disable sreadahead too since we don't ship a pack file for it anyway, so
-# all we'll end up doing is profiling the live CD boot. sreadahead also
+# Disable ureadahead too since we don't ship a pack file for it anyway, so
+# all we'll end up doing is profiling the live CD boot. ureadahead also
# breaks partman occasionally by reading from its synchronisation FIFOs.
-rm -f /root/etc/init/sreadahead.conf
+rm -f /root/etc/init/ureadahead.conf
log_end_msg