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

log bootstrap and autoformat services

Browse Source
This commit is contained in:
Ivan Mikushin 2015-07-22 19:18:43 +05:00
parent a636157882
commit 890052273e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/bootstrap.go
View File

@ -21,11 +21,13 @@ func autoformat(cfg *config.Config) error {
AUTOFORMAT := "AUTOFORMAT=" + strings.Join(cfg.State.Autoformat, " ") AUTOFORMAT := "AUTOFORMAT=" + strings.Join(cfg.State.Autoformat, " ")
FORMATZERO := "FORMATZERO=" + fmt.Sprint(cfg.State.FormatZero) FORMATZERO := "FORMATZERO=" + fmt.Sprint(cfg.State.FormatZero)
cfg.Autoformat["autoformat"].Environment = project.NewMaporEqualSlice([]string{AUTOFORMAT, FORMATZERO}) cfg.Autoformat["autoformat"].Environment = project.NewMaporEqualSlice([]string{AUTOFORMAT, FORMATZERO})
log.Info("Running Autoformat services")
err := docker.RunServices("autoformat", cfg, cfg.Autoformat) err := docker.RunServices("autoformat", cfg, cfg.Autoformat)
return err return err
} }
func runBootstrapContainers(cfg *config.Config) error { func runBootstrapContainers(cfg *config.Config) error {
log.Info("Running Bootstrap services")
return docker.RunServices("bootstrap", cfg, cfg.BootstrapContainers) return docker.RunServices("bootstrap", cfg, cfg.BootstrapContainers)
} }
@ -70,7 +72,7 @@ func bootstrap(cfg *config.Config) error {
return nil return nil
} }
log.Info("Starting bootstrap") log.Info("Launching Bootstrap Docker")
c, err := startDocker(cfg) c, err := startDocker(cfg)
if err != nil { if err != nil {
return err return err

2
scripts/run
View File

@ -86,7 +86,7 @@ fi
UNAME=$(uname) UNAME=$(uname)
KERNEL_ARGS="rancher.password=rancher console=ttyS0 ${QEMU_APPEND}" KERNEL_ARGS="quiet rancher.password=rancher console=ttyS0 ${QEMU_APPEND}"
if [ "$UNAME" == "Darwin" ] && [ -x $(which xhyve) ]; then if [ "$UNAME" == "Darwin" ] && [ -x $(which xhyve) ]; then