Merging casper 1.199.

[live-boot-grml.git] / scripts / live-bottom / 36disable_trackerd

diff --git a/scripts/live-bottom/36disable_trackerd b/scripts/live-bottom/36disable_trackerd
old mode 100644 (file)
new mode 100755 (executable)
index 2ac3e05..667131d
--- a/scripts/live-bottom/36disable_trackerd
+++ b/scripts/live-bottom/36disable_trackerd
@@ -1,26 +1,38 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Disabling trackerd..."
+#set -e
+
+# initramfs-tools header
 
-. /scripts/casper-functions
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+       echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+if [ -n "${NOTIMEZONE}" ]
+then
+       exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling trackerd"
+
+# live-initramfs script
 
-rm -f /root/etc/xdg/autostart/trackerd.desktop \
-      /root/usr/share/autostart/trackerd.desktop
+rm -f /root/etc/xdg/autostart/tracker-applet.desktop \
+       /root/etc/xdg/autostart/trackerd.desktop \
+       /root/usr/share/autostart/trackerd.desktop
 
 log_end_msg