Merging casper 1.105.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index cfba971..f4f8cfd 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.105) gutsy; urgency=low
+
+  * scripts/casper-bottom/36disable_trackerd: Disable trackerd in the live
+    session; it's not very useful in this context and it uses a fair bit of
+    memory.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 24 Sep 2007 17:25:50 +0100
+
 casper (1.104) gutsy; urgency=low
 
   * casper-md5check: Fall back to text output if opening the usplash FIFO

diff --git a/scripts/live-bottom/36disable_trackerd b/scripts/live-bottom/36disable_trackerd
new file mode 100644 (file)
index 0000000..2ac3e05
--- /dev/null
+++ b/scripts/live-bottom/36disable_trackerd
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+PREREQ=""
+DESCRIPTION="Disabling trackerd..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+rm -f /root/etc/xdg/autostart/trackerd.desktop \
+      /root/usr/share/autostart/trackerd.desktop
+
+log_end_msg