From 1aa4ffc514166a740deb9a3cdd459ffcf2d534f3 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 20 May 2019 20:49:45 +0200 Subject: [PATCH] gluon-config-mode gluon-core: fix incorrect gluon.platform reference The is_outdoor function is placed inside the gluon.platform module, not the platform_info module. Currently, the outdoor-mode wizard component and the upgrade script fail due to nil-value calls. --- .../luasrc/lib/gluon/config-mode/wizard/0250-outdoor.lua | 4 ++-- package/gluon-core/luasrc/lib/gluon/upgrade/180-outdoors | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gluon-config-mode-outdoor/luasrc/lib/gluon/config-mode/wizard/0250-outdoor.lua b/package/gluon-config-mode-outdoor/luasrc/lib/gluon/config-mode/wizard/0250-outdoor.lua index edfe839f..2dc382ea 100644 --- a/package/gluon-config-mode-outdoor/luasrc/lib/gluon/config-mode/wizard/0250-outdoor.lua +++ b/package/gluon-config-mode-outdoor/luasrc/lib/gluon/config-mode/wizard/0250-outdoor.lua @@ -1,7 +1,7 @@ return function(form, uci) - local platform_info = require 'platform_info' + local platform = require 'gluon.platform' - if not platform_info.is_outdoor_device() then + if not platform.is_outdoor_device() then -- only visible on wizard for outdoor devices return end diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/180-outdoors b/package/gluon-core/luasrc/lib/gluon/upgrade/180-outdoors index 6c61b1df..6ba822a3 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/180-outdoors +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/180-outdoors @@ -12,7 +12,7 @@ if uci:get('gluon', 'wireless', 'outdoor') ~= nil then end local sysconfig = require 'gluon.sysconfig' -local platform_info = require 'platform_info' +local platform = require 'gluon.platform' local config = site.wifi5.outdoors('preset') local outdoor = false @@ -22,7 +22,7 @@ if sysconfig.gluon_version then outdoor = false elseif config == 'preset' then -- enable outdoor mode through presets on new installs - outdoor = platform_info.is_outdoor_device() + outdoor = platform.is_outdoor_device() else -- enable/disable outdoor mode unconditionally on new installs outdoor = config