diff options
Diffstat (limited to 'libs/uvl')
| -rw-r--r-- | libs/uvl/luasrc/uvl.lua | 14 | ||||
| -rw-r--r-- | libs/uvl/root/lib/uci/schema/default/wireless | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/libs/uvl/luasrc/uvl.lua b/libs/uvl/luasrc/uvl.lua index f7943d8d76..c75b9bd7d2 100644 --- a/libs/uvl/luasrc/uvl.lua +++ b/libs/uvl/luasrc/uvl.lua @@ -334,12 +334,12 @@ function UVL._validate_option( self, option, nodeps ) return false, option:error(ERR.OPT_DATATYPE(option, dt)) end end - end - if not nodeps then - local ok, err = dependencies.check( self, option ) - if not ok then - option:error(err) + if not nodeps then + local ok, err = dependencies.check( self, option ) + if not ok then + option:error(err) + end end end @@ -848,7 +848,7 @@ function uvlitem.config(self, opt) if #self.cref >= 3 then c = c and c[self.cref[3]] or nil end - end + end if c and opt then return c[opt] @@ -912,7 +912,7 @@ function uvlitem._loadconf(self, co, c) if err then self:error(ERR.UCILOAD(self, err)) end - + self._configcache = co end return co diff --git a/libs/uvl/root/lib/uci/schema/default/wireless b/libs/uvl/root/lib/uci/schema/default/wireless index fa9598b844..562d1a44e7 100644 --- a/libs/uvl/root/lib/uci/schema/default/wireless +++ b/libs/uvl/root/lib/uci/schema/default/wireless @@ -31,7 +31,6 @@ config variable option name 'mode' option section 'wireless.wifi-device' option title 'Mode (atheros)' - option required true option type enum list depends type=atheros @@ -378,7 +377,7 @@ config variable option title 'Encryption' option description 'WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.' option type enum - + config enum option variable 'wireless.wifi-iface.encryption' option value 'none' |