From 5a0ad44e459b6d6515abf5309e3edd9de517f2e3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 24 Sep 2020 10:08:41 +0000 Subject: [PATCH] fcron: Fix invalid syntax in update-location-database cronjob Fixes: #12484 Signed-off-by: Michael Tremer --- config/cron/crontab | 2 +- config/rootfiles/core/151/update.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/cron/crontab b/config/cron/crontab index 331eaa4a50..1a1939336e 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -60,7 +60,7 @@ HOME=/ 00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl # Update location database once a month -%hourly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1 +%hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1 # Retry sending spooled mails regularly %hourly * /usr/sbin/dma -q diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh index bf151ef483..4b8fefabcf 100644 --- a/config/rootfiles/core/151/update.sh +++ b/config/rootfiles/core/151/update.sh @@ -56,6 +56,11 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then fi /etc/init.d/collectd restart +# Fix invalid cronjob syntax +sed -e "s/^%hourly,random \* \* \*/%hourly,random */g" \ + -i /var/spool/cron/root.orig +fcrontab -z + # This update needs a reboot... #touch /var/run/need_reboot -- 2.39.5