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

2
cmd/control/install.go
View File

@@ -197,6 +197,7 @@ 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, ".")
if len(vArray) >= 2 {
v, _ := strconv.ParseFloat(vArray[0]+"."+vArray[1], 32) v, _ := strconv.ParseFloat(vArray[0]+"."+vArray[1], 32)
if v < 0.8 || imageVersion == "0.8.0-rc1" { if v < 0.8 || imageVersion == "0.8.0-rc1" {
log.Infof("starting installer container for %s", image) log.Infof("starting installer container for %s", image)
@@ -220,6 +221,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
return nil return nil
} }
} }
}
if _, err := os.Stat("/usr/bin/system-docker"); os.IsNotExist(err) { if _, err := os.Stat("/usr/bin/system-docker"); os.IsNotExist(err) {
if err := os.Symlink("/usr/bin/ros", "/usr/bin/system-docker"); err != nil { if err := os.Symlink("/usr/bin/ros", "/usr/bin/system-docker"); err != 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}"