[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4a4fc8f19a8734a7d92895da3772027550e80f01

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2383 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  4a4fc8f19a8734a7d92895da3772027550e80f01 (commit)
      from  de5896985ccb3c9c732315ddd17106e5c4b1bafe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4a4fc8f19a8734a7d92895da3772027550e80f01
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Jun 4 08:43:15 2022 +0000

    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(a)ipfire.org>
    Cc: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/168/filelists/files | 1 +
 config/rootfiles/core/168/update.sh       | 3 +++
 2 files changed, 4 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files
index 5f5e172df..1f80d8e7d 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 84dec941c..6bb081ff2 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


hooks/post-receive
--
IPFire 2.x development tree