projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d6651b
)
luci-0.8: merge r3828-r3829
author
Jo-Philipp Wich
<jow@openwrt.org>
Sat, 29 Nov 2008 01:45:20 +0000
(
01:45
+0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sat, 29 Nov 2008 01:45:20 +0000
(
01:45
+0000)
applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
patch
|
blob
|
history
contrib/package/olsrd-luci/Makefile
patch
|
blob
|
history
contrib/package/olsrd-luci/files/etc/init.d/olsrd
patch
|
blob
|
history
diff --git
a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index
0f8bc42
..
4da1c40
100644
(file)
--- 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
8e22a74
..
8bb3349
100644
(file)
--- 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
9aee7a3
..
aa2950a
100755
(executable)
--- 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