rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

hashicorp version pkg uses alpha sort on -rc11 metadata - so switching to Josh's catalog pkg

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-02-10 00:37:08 +00:00
parent 3929481b5b
commit 9a75d2d5b4
29 changed files with 523 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/control/install.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/rancher/os/log"
"github.com/codegangsta/cli"
version "github.com/hashicorp/go-version"
"github.com/rancher/catalog-service/utils/version"
"github.com/rancher/os/cmd/control/install"
"github.com/rancher/os/cmd/power"
"github.com/rancher/os/config"
@@ -169,20 +169,7 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
// Versions before 0.8.0-rc3 use the old calling convention (from the lay-down-os shell script)
imageVersion := strings.TrimPrefix(image, "rancher/os:")
installVer, err := version.NewVersion("999.999")
if strings.HasPrefix(imageVersion, "v") {
installVer, err = version.NewVersion(strings.TrimPrefix(imageVersion, "v"))
if err != nil {
log.Errorf("ERROR parsing %s: %s", imageVersion, err)
os.Exit(1)
}
}
newInstallerVersion, err := version.NewVersion("0.8.0-rc3")
if err != nil {
log.Errorf("ERROR parsing %s: %s", "0.8.0-rc3", err)
os.Exit(1)
}
if installVer.LessThan(newInstallerVersion) {
if version.GreaterThan("v0.8.0-rc3", imageVersion) {
log.Infof("user specified to install pre v0.8.0: %s", image)
imageVersion = strings.Replace(imageVersion, "-", ".", -1)
vArray := strings.Split(imageVersion, ".")
@@ -329,7 +316,7 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
}
}
err = layDownOS(image, installType, cloudConfig, device, kappend, kexec)
err := layDownOS(image, installType, cloudConfig, device, kappend, kexec)
if err != nil {
log.Errorf("error layDownOS %s", err)
return err