Merge branch 'master' into next

diff --git a/config/rootfiles/oldcore/150/update.sh b/config/rootfiles/oldcore/150/update.sh
index c125c058cc5adf6498d8f5473c33a81ab18bd3a6..cb8d5326113dce5e0e115349e4a9bb00841e8fc3 100644 (file)
--- a/config/rootfiles/oldcore/150/update.sh
+++ b/config/rootfiles/oldcore/150/update.sh
@@ -103,6 +103,11 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Fix invalid cronjob syntax
+sed -e "s/^%hourly,random \* \* \*/%hourly,random */g" \
+       -i /var/spool/cron/root.orig
+fcrontab -z
+
 # Start services
 /etc/init.d/collectd start