From 15e2fbca3f9b81bd57c29578101fa793938b3559 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 30 Jan 2009 13:51:20 +0000 Subject: [PATCH] Merge r4182 --- contrib/package/luci/Makefile | 2 +- contrib/package/olsrd-luci/files/etc/config/olsrd | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 3a029dd08..d28930718 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 3fc8214ef..49e1b2650 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' -- 2.25.1