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

make the iso run also get the ssh and cloud-init so testing the installer is easier

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2016-12-04 21:27:06 +10:00
parent 087bc6fd2d
commit cc78ff7bd1
13 changed files with 155 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
init/init.go
View File

@@ -71,7 +71,6 @@ func loadModules(cfg *config.CloudConfig) (*config.CloudConfig, error) {
}
func sysInit(c *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("sysInit")
args := append([]string{config.SysInitBin}, os.Args[1:]...)
cmd := &exec.Cmd{
@@ -225,12 +224,10 @@ func RunInit() error {
var metadataFile []byte
initFuncs := []config.CfgFunc{
func(c *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("dfs.PrepareFs")
return c, dfs.PrepareFs(&mountConfig)
},
mountOem,
func(_ *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("showconfig")
cfg := config.LoadConfig()
if cfg.Rancher.Debug {
@@ -246,7 +243,6 @@ func RunInit() error {
},
loadModules,
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("read B2D_STATE")
if util.ResolveDevice("LABEL=B2D_STATE") != "" {
boot2DockerEnvironment = true
cfg.Rancher.State.Dev = "LABEL=B2D_STATE"
@@ -274,7 +270,6 @@ func RunInit() error {
return cfg, nil
},
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("tryMountAndBootstrap")
var err error
cfg, shouldSwitchRoot, err = tryMountAndBootstrap(cfg)
if err != nil {
@@ -283,7 +278,6 @@ func RunInit() error {
return cfg, nil
},
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("cloudinit")
if err := os.MkdirAll(config.CloudConfigDir, os.ModeDir|0755); err != nil {
log.Error(err)
}
@@ -319,7 +313,6 @@ func RunInit() error {
return cfg, nil
},
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("readconfig")
var err error
cloudConfigBootFile, err = ioutil.ReadFile(config.CloudConfigBootFile)
if err != nil {
@@ -332,7 +325,6 @@ func RunInit() error {
return cfg, nil
},
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("switchroot")
if !shouldSwitchRoot {
return cfg, nil
}
@@ -344,7 +336,6 @@ func RunInit() error {
},
mountOem,
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("write meta")
if err := os.MkdirAll(config.CloudConfigDir, os.ModeDir|0755); err != nil {
log.Error(err)
}
@@ -357,7 +348,6 @@ func RunInit() error {
return cfg, nil
},
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("set sate")
if boot2DockerEnvironment {
if err := config.Set("rancher.state.dev", cfg.Rancher.State.Dev); err != nil {
log.Errorf("Failed to update rancher.state.dev: %v", err)
@@ -370,12 +360,10 @@ func RunInit() error {
return config.LoadConfig(), nil
},
func(c *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("preparefs2")
return c, dfs.PrepareFs(&mountConfig)
},
loadModules,
func(c *config.CloudConfig) (*config.CloudConfig, error) {
showMounts("setproxy")
network.SetProxyEnvironmentVariables(c)
return c, nil
},
@@ -400,12 +388,3 @@ func RunInit() error {
return pidOne()
}
func showMounts(msg string) {
mounts, err := ioutil.ReadFile("/proc/mounts")
if err != nil {
log.Infof("+++++++++ showMounts(%s) ERROR: %s", msg, err)
} else {
log.Infof("+++++++++ showMounts(%s) %s", msg, mounts)
}
}