diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2008-11-29 01:45:20 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2008-11-29 01:45:20 +0000 |
| commit | 6d23bc3c1e6802d2748ccf9f8b2887a99bbee4bc (patch) | |
| tree | ab993dc27134b8de02d71063114d3c86b007d1e4 | |
| parent | 5d6651be86e16fbd465c48d03f5e6c216f04afe2 (diff) | |
luci-0.8: merge r3828-r3829
| -rw-r--r-- | applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua | 7 | ||||
| -rw-r--r-- | contrib/package/olsrd-luci/Makefile | 2 | ||||
| -rwxr-xr-x | 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 0f8bc42369..4da1c4060d 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 8e22a7448f..8bb3349905 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 9aee7a3664..aa2950acd4 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 |