fcron: Fix invalid syntax in update-location-database cronjob

Fixes: #12484
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cron/crontab b/config/cron/crontab
index 331eaa4a50db1bb962b701a4ab4dbae90c174bd0..1a1939336e4cb81a1a075157e1e75593e96f4f2b 100644 (file)
--- 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 bf151ef4837e3667684e02ca70b6c5eaf99aebce..4b8fefabcff97815a2a20e56effe8b7c43d43423 100644 (file)
--- 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