From 6d23bc3c1e6802d2748ccf9f8b2887a99bbee4bc Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 29 Nov 2008 01:45:20 +0000 Subject: [PATCH] luci-0.8: merge r3828-r3829 --- applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua | 7 +++++++ contrib/package/olsrd-luci/Makefile | 2 +- contrib/package/olsrd-luci/files/etc/init.d/olsrd | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua index 0f8bc4236..4da1c4060 100644 --- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua +++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua @@ -114,6 +114,13 @@ i:option(Value, "MidValidityTime").optional = true i:option(Value, "HnaInterval").optional = true i:option(Value, "HnaValidityTime").optional = true +ip6t = i:option(ListValue, "Ip6AddrType") +ip6t:value("auto") +ip6t:value("site-local") +ip6t:value("unique-local") +ip6t:value("global") +ip6t.optional = true + adc = i:option(Flag, "AutoDetectChanges") adc.enabled = "yes" adc.disabled = "no" diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile index 8e22a7448..8bb334990 100644 --- a/contrib/package/olsrd-luci/Makefile +++ b/contrib/package/olsrd-luci/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_BASENAME:=olsrd PKG_NAME:=$(PKG_BASENAME)-luci PKG_VERSION:=0.5.6-r2+hg1724 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HGREV:=cac1df64dcd5 PKG_SOURCE:=$(PKG_HGREV).tar.gz diff --git a/contrib/package/olsrd-luci/files/etc/init.d/olsrd b/contrib/package/olsrd-luci/files/etc/init.d/olsrd index 9aee7a366..aa2950acd 100755 --- a/contrib/package/olsrd-luci/files/etc/init.d/olsrd +++ b/contrib/package/olsrd-luci/files/etc/init.d/olsrd @@ -124,7 +124,7 @@ olsrd_write_option() { fi if [ "$value" != "${value%%[G-Zg-z_-]*}" ]; then - if [ "$value" != "yes" -a "$value" != "no" ]; then + if [ "$option" != "Ip6AddrType" -a "$value" != "yes" -a "$value" != "no" ]; then value="\"$value\"" fi fi -- 2.25.1