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

remove dependency on version string

Browse Source 
using rancher.rm_usr kernel param instead
This commit is contained in:
Ivan Mikushin
2015-10-06 18:41:04 +05:00
parent 4899ccd89c
commit c79a64e42e
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
init/root.go
View File

@@ -5,7 +5,6 @@ import (
"io/ioutil"
"os"
"path"
"strings"
"syscall"
log "github.com/Sirupsen/logrus"
@@ -31,15 +30,6 @@ func cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir string) (bool, error)
log.Errorf("Failed to cleanup temp directory %s: %v", tmpDir, err)
}
if strings.HasSuffix(usrVer, "dev") {
log.Debugf("Deleteing old usr: %s", usr)
if err := os.RemoveAll(usr); err != nil {
// Don't care if this fails
log.Errorf("Failed to remove %s: %v", usr, err)
}
return true, nil
}
if _, err := os.Stat(usr); err == nil {
return false, nil
}
@@ -47,12 +37,20 @@ func cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir string) (bool, error)
return true, nil
}
func copyMoveRoot(rootfs string) error {
func copyMoveRoot(rootfs string, rmUsr bool) error {
usrVer := fmt.Sprintf("usr-%s", config.VERSION)
usr := path.Join(rootfs, usrVer)
targetUsr := path.Join(rootfs, "usr")
tmpDir := path.Join(rootfs, "tmp")
if rmUsr {
log.Warnf("Development setup. Removing old usr: %s", usr)
if err := os.RemoveAll(usr); err != nil {
// Don't care if this fails
log.Errorf("Failed to remove %s: %v", usr, err)
}
}
if cont, err := cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir); !cont {
return err
}
@@ -100,7 +98,7 @@ func copyMoveRoot(rootfs string) error {
return nil
}
func switchRoot(rootfs string) error {
func switchRoot(rootfs string, rmUsr bool) error {
for _, i := range []string{"/dev", "/sys", "/proc", "/run"} {
log.Debugf("Moving mount %s to %s", i, path.Join(rootfs, i))
if err := os.MkdirAll(path.Join(rootfs, i), 0755); err != nil {
@@ -111,7 +109,7 @@ func switchRoot(rootfs string) error {
}
}
if err := copyMoveRoot(rootfs); err != nil {
if err := copyMoveRoot(rootfs, rmUsr); err != nil {
return err
}