summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-10-26 13:40:31 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:06 +0100
commitd97cd9e6ed4ccdd3e06ddfd957b6b5b22af21490 (patch)
tree228e44871522faddf5841cb43e6b1ae7b01dd600
parent705393cde8a537bb0a652d676949b9890c110d3a (diff)
downloadlive-boot-d97cd9e6ed4ccdd3e06ddfd957b6b5b22af21490.tar.gz
live-boot-d97cd9e6ed4ccdd3e06ddfd957b6b5b22af21490.zip
Merging casper 1.167.
-rw-r--r--docs/ChangeLog.casper6
-rwxr-xr-xscripts/live-bottom/34disable_kde_services1
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 9056345..6f1b59b 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,9 @@
+casper (1.167) jaunty; urgency=low
+
+ * Disable kwallet from KDE 4 in 34disable_kde_services
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 27 Mar 2009 18:40:35 +0000
+
casper (1.166) jaunty; urgency=low
[ Emmet Hikory ]
diff --git a/scripts/live-bottom/34disable_kde_services b/scripts/live-bottom/34disable_kde_services
index ae13794..3350d61 100755
--- a/scripts/live-bottom/34disable_kde_services
+++ b/scripts/live-bottom/34disable_kde_services
@@ -27,6 +27,7 @@ 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