diff --git a/cmd/control/config.go b/cmd/control/config.go index 8b83c74c..95405012 100644 --- a/cmd/control/config.go +++ b/cmd/control/config.go @@ -64,10 +64,6 @@ func configSubcommands() []cli.Command { Name: "output, o", Usage: "File to which to save", }, - cli.BoolFlag{ - Name: "boot, b", - Usage: "Include cloud-config provided at boot", - }, cli.BoolFlag{ Name: "private, p", Usage: "Include the generated private keys", @@ -257,7 +253,7 @@ func merge(c *cli.Context) { } func export(c *cli.Context) { - content, err := config.Dump(c.Bool("boot"), c.Bool("private"), c.Bool("full")) + content, err := config.Dump(c.Bool("private"), c.Bool("full")) if err != nil { log.Fatal(err) } diff --git a/config/config.go b/config/config.go index 1c771ee1..f1d93cc0 100644 --- a/config/config.go +++ b/config/config.go @@ -102,7 +102,7 @@ func (c *CloudConfig) Merge(values map[interface{}]interface{}) (*CloudConfig, e return t, nil } -func Dump(boot, private, full bool) (string, error) { +func Dump(private, full bool) (string, error) { var cfg *CloudConfig var err error @@ -113,9 +113,6 @@ func Dump(boot, private, full bool) (string, error) { if !private { files = util.FilterStrings(files, func(x string) bool { return x != CloudConfigPrivateFile }) } - if !boot { - files = util.FilterStrings(files, func(x string) bool { return x != CloudConfigBootFile }) - } cfg, err = ChainCfgFuncs(nil, func(_ *CloudConfig) (*CloudConfig, error) { return ReadConfig(nil, true, files...) }, amendNils, diff --git a/init/init.go b/init/init.go index 59cb5dfd..ff35d44e 100644 --- a/init/init.go +++ b/init/init.go @@ -204,7 +204,7 @@ func RunInit() error { } if cfg.Rancher.Debug { - cfgString, err := config.Dump(false, false, true) + cfgString, err := config.Dump(false, true) if err != nil { log.WithFields(log.Fields{"err": err}).Error("Error serializing config") } else {