Merge r4182

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 3a029dd0877731e9b4425bf26b43c453cfac7067..d28930718d138c7b2a8c30866ad18fdfe45c733a 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -262,7 +262,7 @@ define Package/luci-freifunk-community
    +luci-app-ffwizard-leipzig \
    +luci-theme-fledermaus \
    +luci-i18n-german \
-   +PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw \
+   +PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw-plain \
    +PACKAGE_luci-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-freifunk-community:olsrd-luci-mod-nameservice \
    +PACKAGE_luci-freifunk-community:kmod-tun +PACKAGE_luci-freifunk-community:ip \
    +luci-app-olsr

diff --git a/contrib/package/olsrd-luci/files/etc/config/olsrd b/contrib/package/olsrd-luci/files/etc/config/olsrd
index 3fc8214efb1c0adf1b52d2880652b4f6b40f14e0..49e1b2650a8e2ebff8bd84f6821b1ebc73ba6fce 100644 (file)
--- a/contrib/package/olsrd-luci/files/etc/config/olsrd
+++ b/contrib/package/olsrd-luci/files/etc/config/olsrd
@@ -9,10 +9,7 @@ config 'Interface'
        option 'Ip4Broadcast' '255.255.255.255'
 
 config 'LoadPlugin'
-       option 'ignore' '1'
-       option 'library' 'olsrd_dyn_gw.so.0.4'
-       option 'Ping' '141.1.1.1'
-       option 'Interval' '60'
+       option 'library' 'olsrd_dyn_gw_plain.so.0.4'
 
 config 'LoadPlugin'
        option 'library' 'olsrd_nameservice.so.0.3'