Merging casper 1.217.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index da88148..20f5663 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,21 @@
+casper (1.217) lucid; urgency=low
+
+  [ Luke Yelavich ]
+  * ubiquity-hooks/30accessibility: Enable accessible login for the blindness
+    and braile accessibility profiles.
+
+  [ Colin Watson ]
+  * Use egrep rather than 'grep -E' (LP: #512386).
+
+  [ Julien Lavergne ]
+  * 15autologin: Add support for LXDM autologin (LP: #511976).
+
+  [ Evan Dandrea ]
+  * Properly shut down debconf-communicate so that its database gets
+    written (LP: #518272).
+
+ -- Evan Dandrea <evand@ubuntu.com>  Thu, 11 Feb 2010 08:25:53 +0000
+
 casper (1.216) lucid; urgency=low
 
   [ Luke Yelavich ]

diff --git a/scripts/live b/scripts/live
index 26a6a46..110f41d 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -667,7 +667,7 @@ is_nice_device ()
 {
        sysfs_path="${1#/sys}"
 
-       if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+       if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -1677,7 +1677,7 @@ find_livefs ()
 
        # or do the scan of block devices
        # prefer removable devices over non-removable devices, so scan them first
-       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | egrep -v "/(loop|ram|dm-|fd)")
        do
                if [ "$(cat ${sysblock}/removable)" = "1" ]
                then
@@ -1918,9 +1918,7 @@ mountroot ()
                umount "${rootmnt}/dev"
        fi
 
-       # Kill the debconf-communicate instance and close fd's associated with·
-       # debconf-communicate.
-       kill $DEBCONF_COMMUNICATE_PID
+       # Close the fd's associated with debconf-communicate
        exec 3>&- 4<&-
        rm -f /tmp/debconf-in.fifo
        rm -f /tmp/debconf-out.fifo

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index a4df2df..12c937d 100755 (executable)
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -103,4 +103,12 @@ then
        /root/etc/kde4/kdm/kdmrc
 fi
 
+if [ -f /root/etc/lxdm/lxdm.conf ]
+then
+       # Configure LXDM autologin
+       sed -i -r -e "s/^# autologin=dgod/autologin=$USERNAME/" \
+                 -e "s/^# session/session/" \
+       /root/etc/lxdm/lxdm.conf
+fi
+
 log_end_msg