summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-01-30 13:51:20 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-01-30 13:51:20 +0000
commit15e2fbca3f9b81bd57c29578101fa793938b3559 (patch)
treeba3fa78991deb48c6e0fbb2ddacdf4df297dd123 /contrib
parentf2b3332d3fd5b111d955841b1d1f795da5c2c2fc (diff)
Merge r4182
Diffstat (limited to 'contrib')
-rw-r--r--contrib/package/luci/Makefile2
-rw-r--r--contrib/package/olsrd-luci/files/etc/config/olsrd5
2 files changed, 2 insertions, 5 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 3a029dd087..d28930718d 100644
--- 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 3fc8214efb..49e1b2650a 100644
--- 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'