From: Manuel Munz <freifunk@somakoma.de>
Date: Sat, 23 Jun 2012 09:10:06 +0000 (+0000)
Subject: luci-0.10: merge r8775
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d999b68b0034268eff39f393cf23baa85720aa2b;p=oweals%2Fluci.git

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 5ffec43e8..dbe648ae5 100755
--- 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
index dc2c7b2d2..000000000
--- 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