Merging casper 1.163.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index e051d62..7f2f987 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.163) jaunty; urgency=low
+
+  * 34disable_kwallet moved to 34disable_kde_services and disables
+    various services not needed by live CDs
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Mar 2009 14:33:13 +0000
+
 casper (1.162) jaunty; urgency=low
 
   * If /cdrom is writable, call the diverted update-initramfs and copy

diff --git a/scripts/live-bottom/34disable_kde_services b/scripts/live-bottom/34disable_kde_services
new file mode 100755 (executable)
index 0000000..37da8ea
--- /dev/null
+++ b/scripts/live-bottom/34disable_kde_services
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+       echo "${PREREQ}"
+}
+
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
+esac
+
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling unnecessary KDE services..."
+
+# live-initramfs script
+
+rm -f /root/usr/share/services/kded/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/kded/kpackagekitd.desktop
+rm -f /root/usr/share/kde4/services/kded/susefreespacenotifier.desktop
+
+log_end_msg