Core Update 168: Ship fcrontab and rebuild it from scratch

This is necessary due to IDSv4 changes introducing changes to fcrontab.
While this patch will cause any custom cron jobs configured there to be
lost, it is better to start with a defined state rather than sed'ing
on this file.

Cc: Michael Tremer <michael.tremer@ipfire.org>
Cc: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files
index 5f5e172df215301c013ec4995524b6d4930b434e..1f80d8e7d24369619e52d44ad75c2dc6efff75e5 100644 (file)
--- a/config/rootfiles/core/168/filelists/files
+++ b/config/rootfiles/core/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/core/168/update.sh b/config/rootfiles/core/168/update.sh
index 84dec941cfff74d52fed9511ae4ad54a3bd743de..6bb081ff28d2ce54384e6509752a80a470a1a0ba 100644 (file)
--- a/config/rootfiles/core/168/update.sh
+++ b/config/rootfiles/core/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