Merge branch 'next' into temp-c169-development

diff --git a/config/rootfiles/oldcore/168/filelists/files b/config/rootfiles/oldcore/168/filelists/files
index 5f5e172df215301c013ec4995524b6d4930b434e..1f80d8e7d24369619e52d44ad75c2dc6efff75e5 100644 (file)
--- a/config/rootfiles/oldcore/168/filelists/files
+++ b/config/rootfiles/oldcore/168/filelists/files
@@ -403,3 +403,4 @@ var/ipfire/header.pl
 var/ipfire/ids-functions.pl
 var/ipfire/menu.d/20-status.menu
 var/ipfire/menu.d/30-network.menu
+var/spool/cron/root.orig

diff --git a/config/rootfiles/oldcore/168/update.sh b/config/rootfiles/oldcore/168/update.sh
index 84dec941cfff74d52fed9511ae4ad54a3bd743de..6bb081ff28d2ce54384e6509752a80a470a1a0ba 100644 (file)
--- a/config/rootfiles/oldcore/168/update.sh
+++ b/config/rootfiles/oldcore/168/update.sh
@@ -128,6 +128,9 @@ fi
 # Repair any broken MDRAID arrays
 /usr/local/bin/repair-mdraid
 
+# Rebuild fcrontab from scratch
+/usr/bin/fcrontab -z
+
 # Start services
 /etc/init.d/fcron restart
 /etc/init.d/sshd restart