Merging casper 1.229.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 174d29e..066c0a1 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,15 @@
+casper (1.229) lucid; urgency=low
+
+  [ Jonathan Riddell ]
+  * Update scripts/casper-bottom/34disable_kde_services for lucid
+
+  [ Evan Dandrea ]
+  * Don't let apt try to auto-detect the CD-ROM device using udev.  We
+    already know what it is, and using udev to find it again wont work
+    for USB disks.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Tue, 23 Mar 2010 11:42:00 +0000
+
 casper (1.228) lucid; urgency=low
 
   * Update for the new libplymouth2.

diff --git a/scripts/live-bottom/34disable_kde_services b/scripts/live-bottom/34disable_kde_services
index 3350d61..41f881c 100755 (executable)
--- a/scripts/live-bottom/34disable_kde_services
+++ b/scripts/live-bottom/34disable_kde_services
@@ -26,16 +26,15 @@ log_begin_msg "Disabling unnecessary KDE services..."
 
 # live-initramfs script
 
-rm -f /root/usr/share/services/kded/kwalletd.desktop
-rm -f /root/usr/share/kde4/services/kwalletd.desktop
 rm -f /root/usr/share/autostart/kab2kabc.desktop
 rm -f /root/usr/share/autostart/kabcdistlistupdater.desktop
 rm -f /root/usr/share/autostart/korgac.desktop
 rm -f /root/usr/share/autostart/printer-applet.desktop
 rm -f /root/usr/share/autostart/nepomukserver.desktop
+rm -f /root/usr/share/kde4/services/kwalletd.desktop
 rm -f /root/usr/share/kde4/services/kded/kpackagekitd.desktop
-rm -f /root/usr/share/kde4/services/kded/susefreespacenotifier.desktop
+rm -f /root/usr/share/kde4/services/kded/freespacenotifier.desktop
 rm -f /root/usr/share/kde4/services/plasma-runner-contacts.desktop  # starts akonadi
-rm -f /root/etc/xdg/autostart/update-notifier-kde.desktop
+rm -f /root/usr/share/kde4/services/kded/notificationhelper.desktop
 
 log_end_msg

diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom
index 0b3f79b..eb7fbd8 100755 (executable)
--- a/scripts/live-bottom/41apt_cdrom
+++ b/scripts/live-bottom/41apt_cdrom
@@ -37,7 +37,7 @@ then
        mount -n -o bind /proc /root/proc
        mount -n -o bind /dev /root/dev
 
-       chroot /root apt-cdrom -m add
+       chroot /root apt-cdrom -o Acquire::cdrom::AutoDetect=false -m add
 
        umount /root/dev
        umount /root/proc