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

tolerate the --yes param to device init

Browse Source
This commit is contained in:
Eugene Mirotin 2017-06-08 23:55:56 +03:00
parent 1cfe64e4a7
commit 8d91a5732a
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Gzip images when uploading in `resin deploy` - Gzip images when uploading in `resin deploy`
- Show a clear message immediately as the deploy starts, if we're deploying an image. - Show a clear message immediately as the deploy starts, if we're deploying an image.
- Allow OS version selection when doing `resin device init` - Allow OS version selection when doing `resin device init`
- Actually tolerate the `--yes` param to `resin device init`
### Fixed ### Fixed

3
build/actions/device.js
View File

@ -311,6 +311,9 @@ exports.init = {
return capitanoRunAsync(configureCommand).then(function() { return capitanoRunAsync(configureCommand).then(function() {
var osInitCommand; var osInitCommand;
osInitCommand = "os initialize '" + tempPath + "' --type " + application.device_type; osInitCommand = "os initialize '" + tempPath + "' --type " + application.device_type;
if (options.yes) {
osInitCommand += ' --yes';
}
return capitanoRunAsync(osInitCommand); return capitanoRunAsync(osInitCommand);
})["catch"](function(error) { })["catch"](function(error) {
return resin.models.device.remove(device.uuid)["finally"](function() { return resin.models.device.remove(device.uuid)["finally"](function() {

2
lib/actions/device.coffee
View File

@ -409,6 +409,8 @@ exports.init =
capitanoRunAsync(configureCommand) capitanoRunAsync(configureCommand)
.then -> .then ->
osInitCommand = "os initialize '#{tempPath}' --type #{application.device_type}" osInitCommand = "os initialize '#{tempPath}' --type #{application.device_type}"
if options.yes
osInitCommand += ' --yes'
capitanoRunAsync(osInitCommand) capitanoRunAsync(osInitCommand)
# Make sure the device resource is removed if there is an # Make sure the device resource is removed if there is an
# error when configuring or initializing a device image # error when configuring or initializing a device image