1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00

Remove rancher.state.formatzero kernel parameter

This commit is contained in:
Josh Curl
2016-09-25 11:39:46 -07:00
parent a22075aef2
commit 133c2610d1
4 changed files with 2 additions and 11 deletions

View File

@@ -3,7 +3,6 @@ package init
import (
"syscall"
"fmt"
"strings"
log "github.com/Sirupsen/logrus"
@@ -18,9 +17,8 @@ func autoformat(cfg *config.CloudConfig) (*config.CloudConfig, error) {
return cfg, nil
}
AUTOFORMAT := "AUTOFORMAT=" + strings.Join(cfg.Rancher.State.Autoformat, " ")
FORMATZERO := "FORMATZERO=" + fmt.Sprint(cfg.Rancher.State.FormatZero)
t := *cfg
t.Rancher.Autoformat["autoformat"].Environment = []string{AUTOFORMAT, FORMATZERO}
t.Rancher.Autoformat["autoformat"].Environment = []string{AUTOFORMAT}
log.Info("Running Autoformat services")
_, err := compose.RunServiceSet("autoformat", &t, t.Rancher.Autoformat)
return &t, err