summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-04-22 14:37:20 +0000
committerSteven Barth <steven@midlink.org>2008-04-22 14:37:20 +0000
commit7eb6eebf51c300d6e3f71faae520d461b6babe7d (patch)
tree8bcfb75a033f73514c73a24a1b94241cd0e8d2bc
parent007b82885fbc8f8adf7dfe99c510f2d478e6fa59 (diff)
* Fixed a bug in CBI throwing an error if a config section gets deleted
* Fixed automatic restart of olsrd while applying OLSR configuration
-rw-r--r--core/contrib/uci/luci2
-rw-r--r--core/src/ffluci/cbi.lua5
2 files changed, 6 insertions, 1 deletions
diff --git a/core/contrib/uci/luci b/core/contrib/uci/luci
index 7cc08215a..10a05bdee 100644
--- a/core/contrib/uci/luci
+++ b/core/contrib/uci/luci
@@ -17,7 +17,7 @@ config extern flash_keep
config event uci_oncommit
option network "/etc/init.d/network restart"
option wireless "/etc/init.d/network restart"
- option olsrd "/etc/init.d/olsrd restart"
+ option olsr "/etc/init.d/olsrd restart"
option dhcp "/etc/init.d/dnsmasq restart"
option luci_fw "/etc/init.d/luci_fw restart"
option dropbear "/etc/init.d/dropbear restart"
diff --git a/core/src/ffluci/cbi.lua b/core/src/ffluci/cbi.lua
index 435977a17..f09d48ad7 100644
--- a/core/src/ffluci/cbi.lua
+++ b/core/src/ffluci/cbi.lua
@@ -178,6 +178,11 @@ function Map.del(self, section, option)
self.ucidata[section][option] = nil
else
self.ucidata[section] = nil
+ for i, k in ipairs(self.ucidata[".order"]) do
+ if section == k then
+ table.remove(self.ucidata[".order"], i)
+ end
+ end
end
end
return stat