ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-20 14:13:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support the legacy RESIN_OVERRIDE_LOCK

Browse Source 
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
This commit is contained in:
Pablo Carranza Velez 2018-01-18 15:32:49 -03:00
parent 056a5bc6c9
commit ac3e31edfb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/device-config.coffee
View File

@ -50,7 +50,7 @@ module.exports = class DeviceConfig
deltaRetryInterval: { envVarName: 'RESIN_SUPERVISOR_DELTA_RETRY_INTERVAL', varType: 'int' } deltaRetryInterval: { envVarName: 'RESIN_SUPERVISOR_DELTA_RETRY_INTERVAL', varType: 'int' }
lockOverride: { envVarName: 'RESIN_SUPERVISOR_OVERRIDE_LOCK', varType: 'bool', defaultValue: 'false' } lockOverride: { envVarName: 'RESIN_SUPERVISOR_OVERRIDE_LOCK', varType: 'bool', defaultValue: 'false' }
} }
@validKeys = [ 'RESIN_HOST_LOG_TO_DISPLAY', 'RESIN_SUPERVISOR_VPN_CONTROL' ].concat(_.map(@configKeys, 'envVarName')) @validKeys = [ 'RESIN_HOST_LOG_TO_DISPLAY', 'RESIN_SUPERVISOR_VPN_CONTROL', 'RESIN_OVERRIDE_LOCK' ].concat(_.map(@configKeys, 'envVarName'))
@actionExecutors = { @actionExecutors = {
changeConfig: (step) => changeConfig: (step) =>
@logger.logConfigChange(step.humanReadableTarget) @logger.logConfigChange(step.humanReadableTarget)
@ -141,8 +141,8 @@ module.exports = class DeviceConfig
else return false else return false
getRequiredSteps: (currentState, targetState, stepsInProgress) => getRequiredSteps: (currentState, targetState, stepsInProgress) =>
current = currentState.local?.config ? {} current = _.clone(currentState.local?.config ? {})
target = targetState.local?.config ? {} target = _.clone(targetState.local?.config ? {})
steps = [] steps = []
@config.get('deviceType') @config.get('deviceType')
.then (deviceType) => .then (deviceType) =>
@ -154,6 +154,9 @@ module.exports = class DeviceConfig
'int': (a, b) -> 'int': (a, b) ->
checkInt(a) == checkInt(b) checkInt(a) == checkInt(b)
} }
# If the legacy lock override is used, place it as the new variable
if checkTruthy(target['RESIN_OVERRIDE_LOCK'])
target['RESIN_SUPERVISOR_OVERRIDE_LOCK'] = target['RESIN_OVERRIDE_LOCK']
for own key, { envVarName, varType } of @configKeys for own key, { envVarName, varType } of @configKeys
if !match[varType](current[envVarName], target[envVarName]) if !match[varType](current[envVarName], target[envVarName])
configChanges[key] = target[envVarName] configChanges[key] = target[envVarName]