luci-0.10: merge r8775

diff --git a/contrib/package/freifunk-common/files/etc/init.d/freifunk b/contrib/package/freifunk-common/files/etc/init.d/freifunk
index 5ffec43e83c4174d9977c5cea0f48073611b41a2..dbe648ae5d5302d3770842de8719ae7a1221c8a4 100755 (executable)
--- a/contrib/package/freifunk-common/files/etc/init.d/freifunk
+++ b/contrib/package/freifunk-common/files/etc/init.d/freifunk
@@ -15,15 +15,11 @@ boot() {
                echo "*/5 * * * *       /usr/sbin/ff_olsr_watchdog" >> /etc/crontabs/root
        }
 
-       grep -q '/usr/sbin/ff_rdate' /etc/crontabs/root || {
-               echo "0 */4 * * *       /usr/sbin/ff_rdate" >> /etc/crontabs/root
-       }
-
        [ -d /etc/rc.local.d ] && {
                for file in /etc/rc.local.d/*; do
                        test -f "$file" && . "$file"
                done
        }
 
-       ( sleep 40; /usr/sbin/ff_rdate; /etc/init.d/cron restart ) &
+       /etc/init.d/cron restart &
 }

diff --git a/contrib/package/freifunk-common/files/usr/sbin/ff_rdate b/contrib/package/freifunk-common/files/usr/sbin/ff_rdate
deleted file mode 100755 (executable)
index dc2c7b2..0000000
--- a/contrib/package/freifunk-common/files/usr/sbin/ff_rdate
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-uci_get_one() {
-       for var in "$@"; do
-               uci -P /var/state get "$var" 2>/dev/null && break
-       done
-}
-
-local servers="$(uci_get_one 'network.wan.lease_timesrv') $(uci show timeserver | sed -ne 's/.*hostname=//p')"
-
-if [ -n "$servers" ]; then
-       for server in $servers; do
-               rdate -s $server >/dev/null 2>/dev/null && \
-                       logger -t rdate "Synced with $server" && break
-
-               logger -t rdate "Failed to sync with $server"
-       done
-else
-       logger -t rdate "No usable time server found"
-fi