luci-0.8: Merge r4458

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index c8eeee22368a2e4d13a158d04c61c093cd2b05a8..ce855e2fe8e4e936fe481273a407df0c3389c519 100644 (file)
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -55,27 +55,26 @@ config defaults wifi_device
     option disabled  0
     option txpower   10
 
-
 config defaults wifi_iface
     option mode                adhoc
     option bssid    02:CA:FF:EE:BA:BE
     option sw_merge 1
 
-
 config defaults interface
     option netmask  255.0.0.0
     option dns      "88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222"
 
-
 config defaults alias
        option netmask  255.255.255.0
 
-
 config defaults dhcp
        option leasetime 30m
 
-
 config defaults olsr_interface
+       option Ip4Broadcast 255.255.255.255
+
+config defaults time
+       option rdate_servers "128.138.140.44 171.64.7.77 171.64.7.99 81.169.154.44 130.133.1.10"
 
 
 config community leipzig

diff --git a/modules/freifunk/root/etc/init.d/freifunk b/modules/freifunk/root/etc/init.d/freifunk
index 13dfde7f682024f60e3602fef240224d59ac82c7..79bcbc7ba9e43cccade0953d39f35b71f39540da 100755 (executable)
--- a/modules/freifunk/root/etc/init.d/freifunk
+++ b/modules/freifunk/root/etc/init.d/freifunk
@@ -17,6 +17,10 @@ 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
+       }
+
        [ -f /etc/rc.local ] && . /etc/rc.local
        [ -d /etc/rc.local.d ] && {
                for file in /etc/rc.local.d/*; do
@@ -24,5 +28,5 @@ boot() {
                done
        }
 
-       /etc/init.d/cron restart
+       ( /usr/sbin/ff_rdate; /etc/init.d/cron restart ) &
 }