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

Real hardware installer fixes

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-01-17 01:16:49 +00:00
parent e59ede0a08
commit 70d5495c7e
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/control/install.go
View File

@@ -150,9 +150,10 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
}
// Versions before 0.8.0-rc2 use the old calling convention (from the lay-down-os shell script)
imageVersion := strings.TrimPrefix(image, "rancher/os:v")
if image != imageVersion {
log.Infof("user specified different install image: %s != %s", image, imageVersion)
// TODO: This needs fixing before 0.8.0 GA's - actually parse the version string, and use for any numbered version before 0.8.0-rc3
imageVersion := strings.TrimPrefix(image, "rancher/os:")
if imageVersion == "v0.7.1" || imageVersion == "v0.7.0" {
log.Infof("user specified to install 0.7.0/0.7.1: %s", image)
imageVersion = strings.Replace(imageVersion, "-", ".", -1)
vArray := strings.Split(imageVersion, ".")
v, _ := strconv.ParseFloat(vArray[0]+"."+vArray[1], 32)
@@ -188,10 +189,13 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
useIso := false
// --isoinstallerloaded is used if the ros has created the installer container from and image that was on the booted iso
if !isoinstallerloaded {
log.Infof("start !isoinstallerloaded")
if _, err := os.Stat("/dist/initrd"); os.IsNotExist(err) {
if err = mountBootIso(); err != nil {
log.Debugf("mountBootIso error %s", err)
} else {
log.Infof("trying to load /bootiso/rancheros/installer.tar.gz")
if _, err := os.Stat("/bootiso/rancheros/"); err == nil {
cmd := exec.Command("system-docker", "load", "-i", "/bootiso/rancheros/installer.tar.gz")
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
@@ -221,6 +225,7 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
// "install",
"-t", installType,
"-d", device,
"-i", image, // TODO: this isn't used - I'm just using it to over-ride the defaulting
}
if force {
installerCmd = append(installerCmd, "-f")
@@ -241,18 +246,17 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
installerCmd = append(installerCmd, "--kexec")
}
// TODO: mount at /mnt for shared mount?
if useIso {
util.Unmount("/bootiso")
}
cmd := exec.Command("system-docker", installerCmd...)
log.Debugf("Run(%v)", cmd)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil {
if useIso {
util.Unmount("/bootiso")
}
return err
}
if useIso {
util.Unmount("/bootiso")
}
return nil
}
}
@@ -287,7 +291,7 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
if isoinstallerloaded {
log.Debugf("running isoinstallerloaded...")
// TODO: I hope to remove this from here later.
// TODO: detect if its not mounted and then optionally mount?
if err := mountBootIso(); err != nil {
log.Errorf("error mountBootIso %s", err)
return err