fcron: Run weekly tasks on Monday.

diff --git a/config/cron/crontab b/config/cron/crontab
index 5cca1facc4601655514392f04f2907c93e535a27..ad90b07ca9af33eeaaac587b8f4d94c8bc53dea3 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -11,7 +11,7 @@ HOME=/
 */5 * * * *    test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.cyclic
 01 * * * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.hourly
 &nice(10),bootrun 25 1 * * *   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily
-&nice(10),bootrun 47 2 * * 0   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
+&nice(10),bootrun 47 2 * * 1   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
 &nice(10),bootrun 52 3 1 * *   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly
 
 # Log rotation

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index f4817779402e6e88c0b332e2699bd95e3316ed09..d4067337e7f1a18f54f89e98a40d37b6b8333f81 100644 (file)
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -5,3 +5,4 @@ srv/web/ipfire/cgi-bin/ovpnmain.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 85ab2e9473d745e1bc54068e3a2e394d03b862da..729e764f0a96b3f3daf0e7c682b4c6fb9de50de9 100644 (file)
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -49,6 +49,9 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 # Convert OpenVPN RW connections.
 /usr/sbin/ovpn-ccd-convert
 
+# Re-read crontab.
+fcrontab -z &>/dev/null
+
 #Rebuild module dep's
 #arch=`uname -m`
 #if [ ${arch::3} == "arm" ]; then