rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-23 03:20:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1859 from SvenDowideit/fix-dev-version-check

Browse Source 
fix ros-install version check for dev builds
This commit is contained in:
Sven Dowideit
2017-05-17 22:24:03 +10:00
committed by GitHub
parent f0f990f08d bed064419b
commit 720b54f1fd
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/control/install.go
View File

@@ -197,27 +197,29 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
log.Infof("user specified to install pre v0.8.0: %s", image) log.Infof("user specified to install pre v0.8.0: %s", image)
imageVersion = strings.Replace(imageVersion, "-", ".", -1) imageVersion = strings.Replace(imageVersion, "-", ".", -1)
vArray := strings.Split(imageVersion, ".") vArray := strings.Split(imageVersion, ".")
v, _ := strconv.ParseFloat(vArray[0]+"."+vArray[1], 32) if len(vArray) >= 2 {
if v < 0.8 || imageVersion == "0.8.0-rc1" { v, _ := strconv.ParseFloat(vArray[0]+"."+vArray[1], 32)
log.Infof("starting installer container for %s", image) if v < 0.8 || imageVersion == "0.8.0-rc1" {
if installType == "generic" || log.Infof("starting installer container for %s", image)
installType == "syslinux" || if installType == "generic" ||
installType == "gptsyslinux" { installType == "syslinux" ||
cmd := exec.Command("system-docker", "run", "--net=host", "--privileged", "--volumes-from=all-volumes", installType == "gptsyslinux" {
"--entrypoint=/scripts/set-disk-partitions", image, device, diskType) cmd := exec.Command("system-docker", "run", "--net=host", "--privileged", "--volumes-from=all-volumes",
"--entrypoint=/scripts/set-disk-partitions", image, device, diskType)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil {
return err
}
}
cmd := exec.Command("system-docker", "run", "--net=host", "--privileged", "--volumes-from=user-volumes",
"--volumes-from=command-volumes", image, "-d", device, "-t", installType, "-c", cloudConfig,
"-a", kappend)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return err return err
} }
return nil
} }
cmd := exec.Command("system-docker", "run", "--net=host", "--privileged", "--volumes-from=user-volumes",
"--volumes-from=command-volumes", image, "-d", device, "-t", installType, "-c", cloudConfig,
"-a", kappend)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil {
return err
}
return nil
} }
} }

3
scripts/run
View File

@@ -159,7 +159,8 @@ fi
if [ "$BOOT_PXE" == "1" ]; then if [ "$BOOT_PXE" == "1" ]; then
set -ex set -ex
sudo pixiecore boot \ PIXIECORE=$(which pixiecore)
sudo -E $PIXIECORE boot \
"${KERNEL}" \ "${KERNEL}" \
"${INITRD}" \ "${INITRD}" \
--cmdline="${KERNEL_ARGS}" --cmdline="${KERNEL_ARGS}"