From 3c2593b68436479d10cfa09def81b6f8b6e3546b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 11 Jun 2020 23:52:22 +0200
Subject: [PATCH] gluon-core: fix handling of 'disabled' site.conf attributes
for mesh interfaces
Because is_disabled() was always returning true or false, the
first_non_nil() would never actually check the default setting from
site.conf. This was broken since v2017.1.
Fixes: 6cf03bab37f9 ("treewide: replace normal uses of luci.model.uci with simple-uci to reduce LuCI dependencies")
---
package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
index f72908a21..073d06948 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
@@ -85,7 +85,7 @@ local function is_disabled(name)
if uci:get('wireless', name) then
return uci:get_bool('wireless', name, 'disabled')
else
- return false
+ return nil
end
end
--
GitLab