rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-16 06:59:12 +00:00
Code Issues Releases Wiki Activity

Revert "WIP New ros cli"

Browse Source
This commit is contained in:
Sven Dowideit
2017-03-14 12:11:24 +10:00
committed by GitHub
parent 4cd73c111e
commit 2d92956c82
13 changed files with 134 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/control/os.go
View File

@@ -22,7 +22,6 @@ import (
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
"github.com/rancher/os/docker"
"github.com/rancher/os/util"
)
type Images struct {
@@ -227,7 +226,7 @@ func startUpgradeContainer(image string, stage, force, reboot, kexec bool, upgra
if len(imageSplit) > 1 && imageSplit[1] == config.Version+config.Suffix {
confirmation = fmt.Sprintf("Already at version %s. Continue anyway", imageSplit[1])
}
if !force && !util.Yes(confirmation) {
if !force && !yes(confirmation) {
os.Exit(1)
}
@@ -277,7 +276,7 @@ func startUpgradeContainer(image string, stage, force, reboot, kexec bool, upgra
return err
}
if reboot && (force || util.Yes("Continue with reboot")) {
if reboot && (force || yes("Continue with reboot")) {
log.Info("Rebooting")
power.Reboot()
}