From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 22 Jan 2011 23:26:21 +0000 (+0100)
Subject: core45: remove some addon cronjobs if the addons are not installed.
X-Git-Tag: v2.9-core45~1^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd3c8b59949509e6bc8a77104deb15854ad187bb;p=people%2Fstevee%2Fipfire-2.x.git

core45: remove some addon cronjobs if the addons are not installed.
---

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 582bd82135..69b61e367a 100644
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -26,7 +26,7 @@
 
 #
 # Remove core updates from pakfire cache to save space...
-rm -f /var/cache/pakfire core-upgrade-*.ipfire
+rm -f /var/cache/pakfire/core-upgrade-*.ipfire
 #
 #Stop services
 echo Stopping Proxy
@@ -38,6 +38,12 @@ killall vpn-watch
 #Extract files
 extract_files
 
+#
+# Remove some addon cronjobs if the addons are not installed
+[ ! -e /opt/pakfire/db/installed/meta-cacti ] && rm -f /etc/fcron.cyclic/cacti.cron
+[ ! -e /opt/pakfire/db/installed/meta-gnump3d ] && rm -f /etc/fcron.daily/gnump3d-index
+[ ! -e /opt/pakfire/db/installed/meta-asterisk ] && rm -f /etc/fcron.minutely/wakeup.sh
+
 # Remove disable cron mails...
 sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp
 fcrontab /var/tmp/root.tmp