ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-20 17:33:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure hostname truly is optional when configuring device images

Browse Source 
Change-Type: patch
This commit is contained in:
Tim Perry 2017-10-05 19:29:18 +02:00
parent d1fd5a6bff
commit 3df7bfe700
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/actions/local/configure.js
View File

@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
var BOOT_PARTITION, CONNECTIONS_FOLDER, CONNECTION_FILE, getConfiguration, getConfigurationSchema, inquirerOptions, prepareConnectionFile;
var BOOT_PARTITION, CONNECTIONS_FOLDER, CONNECTION_FILE, getConfiguration, getConfigurationSchema, inquirerOptions, prepareConnectionFile, removeHostname;
BOOT_PARTITION = {
primary: 1
@ -31,10 +31,14 @@ getConfigurationSchema = function(connnectionFileName) {
mapper: [
{
template: {
hostname: '{{hostname}}',
persistentLogging: '{{persistentLogging}}'
},
domain: [['config_json', 'hostname'], ['config_json', 'persistentLogging']]
domain: [['config_json', 'persistentLogging']]
}, {
template: {
hostname: '{{hostname}}'
},
domain: [['config_json', 'hostname']]
}, {
template: {
wifi: {
@ -157,8 +161,16 @@ prepareConnectionFile = function(target) {
partition: BOOT_PARTITION,
path: CONNECTIONS_FOLDER + "/resin-wifi"
}, CONNECTION_FILE).thenReturn(null);
}).then(function(connnectionFileName) {
return getConfigurationSchema(connnectionFileName);
}).then(function(connectionFileName) {
return getConfigurationSchema(connectionFileName);
});
};
removeHostname = function(schema) {
var _;
_ = require('lodash');
return schema.mapper = _.reject(schema.mapper, function(mapper) {
return _.isEqual(Object.keys(mapper.template), ['hostname']);
});
};
@ -185,6 +197,9 @@ module.exports = {
}).then(function(configurationSchema) {
return denymount(params.target, function(cb) {
return reconfix.readConfiguration(configurationSchema, params.target).then(getConfiguration).then(function(answers) {
if (!answers.hostname) {
removeHostname(configurationSchema);
}
return reconfix.writeConfiguration(configurationSchema, answers, params.target);
}).asCallback(cb);
});

20
lib/actions/local/configure.coffee
View File

@ -21,13 +21,18 @@ getConfigurationSchema = (connnectionFileName = 'resin-wifi') ->
mapper: [
{
template:
hostname: '{{hostname}}'
persistentLogging: '{{persistentLogging}}'
domain: [
[ 'config_json', 'hostname' ]
[ 'config_json', 'persistentLogging' ]
]
}
{
template:
hostname: '{{hostname}}'
domain: [
[ 'config_json', 'hostname' ]
]
}
{
template:
wifi:
@ -176,8 +181,13 @@ prepareConnectionFile = (target) ->
, CONNECTION_FILE
.thenReturn(null)
.then (connnectionFileName) ->
return getConfigurationSchema(connnectionFileName)
.then (connectionFileName) ->
return getConfigurationSchema(connectionFileName)
removeHostname = (schema) ->
_ = require('lodash')
schema.mapper = _.reject schema.mapper, (mapper) ->
_.isEqual(Object.keys(mapper.template), ['hostname'])
module.exports =
signature: 'local configure <target>'
@ -209,6 +219,8 @@ module.exports =
reconfix.readConfiguration(configurationSchema, params.target)
.then(getConfiguration)
.then (answers) ->
if not answers.hostname
removeHostname(configurationSchema)
reconfix.writeConfiguration(configurationSchema, answers, params.target)
.asCallback(cb)
.then ->