From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 Nov 2012 10:01:34 +0000 (+0100)
Subject: core 65: Don't replace crontab.
X-Git-Tag: v2.11-core65~1^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1075e0b5f0c08695a839462c5609e919d24b8a5c;p=people%2Fms%2Fipfire-2.x.git

core 65: Don't replace crontab.

Just update the necessary bits because users may probably
have added their own configurations.
---

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 91272a4e43..6c88a31b5c 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -7,4 +7,3 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/ovpn-ccd-convert
 var/ipfire/general-functions.pl
 var/ipfire/langs
-var/spool/cron/root.orig
diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index fca72115e1..88f5b3633d 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -49,7 +49,9 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 # Convert OpenVPN RW connections.
 /usr/sbin/ovpn-ccd-convert
 
-# Re-read crontab.
+# Update crontab.
+sed -i /var/spool/cron/root.orig \
+	-e 's@^.*fcron.weekly.*$@\&nice(10),bootrun 47 2 \* \* 1\ttest -x /usr/local/bin/run-parts \&\& /usr/local/bin/run-parts /etc/fcron.weekly@'
 fcrontab -z &>/dev/null
 
 # Reload apache configuration.