From: Peter Müller <peter.mueller@ipfire.org>
Date: Sat, 4 Jun 2022 08:43:15 +0000 (+0000)
Subject: Core Update 168: Ship fcrontab and rebuild it from scratch
X-Git-Tag: v2.27-core170~107^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=4a4fc8f19a8734a7d92895da3772027550e80f01;ds=sidebyside

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 5f5e172df2..1f80d8e7d2 100644
--- 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 84dec941cf..6bb081ff28 100644
--- 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