rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-19 07:19:05 +00:00
Code Issues Releases Wiki Activity

ros os upgrade: ask for confirmation first, then download the image and run upgrade

Browse Source 
The confirmation question is a bit different if you are upgrading to the same version
This commit is contained in:
Ivan Mikushin 2016-05-24 15:18:13 -07:00
parent 50153d77c5
commit af6079f780
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/control/os.go
View File

@ -216,6 +216,16 @@ func startUpgradeContainer(image string, stage, force, reboot, kexec bool, upgra
} }
} }
fmt.Printf("Upgrading to %s\n", image)
confirmation := "Continue"
imageSplit := strings.Split(image, ":")
if len(imageSplit) > 1 && imageSplit[1] == config.VERSION+config.SUFFIX {
confirmation = fmt.Sprintf("Already at version %s. Continue anyway", imageSplit[1])
}
if !force && !yes(in, confirmation) {
os.Exit(1)
}
container, err := compose.CreateService(nil, "os-upgrade", &composeConfig.ServiceConfigV1{ container, err := compose.CreateService(nil, "os-upgrade", &composeConfig.ServiceConfigV1{
LogDriver: "json-file", LogDriver: "json-file",
Privileged: true, Privileged: true,
@ -244,19 +254,6 @@ func startUpgradeContainer(image string, stage, force, reboot, kexec bool, upgra
} }
if !stage { if !stage {
imageSplit := strings.Split(image, ":")
if len(imageSplit) > 1 && imageSplit[1] == config.VERSION {
if !force && !yes(in, fmt.Sprintf("Already at version %s. Continue anyways", imageSplit[1])) {
os.Exit(1)
}
} else {
fmt.Printf("Upgrading to %s\n", image)
if !force && !yes(in, "Continue") {
os.Exit(1)
}
}
// If there is already an upgrade container, delete it // If there is already an upgrade container, delete it
// Up() should to this, but currently does not due to a bug // Up() should to this, but currently does not due to a bug
if err := container.Delete(context.Background(), options.Delete{}); err != nil { if err := container.Delete(context.Background(), options.Delete{}); err != nil {