From f58f047b7fc693af2ef3817ae34cced82173f654 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 10 Apr 2017 14:33:38 -0400 Subject: [PATCH] containerd: revert the auto config creation rather than automagically doing this, it is the user's responsibility to review the output of `containerd config default` and create the config themselves. Signed-off-by: Vincent Batts --- cmd/containerd/main.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go index 8377357..6c96be4 100644 --- a/cmd/containerd/main.go +++ b/cmd/containerd/main.go @@ -157,19 +157,7 @@ func before(context *cli.Context) error { err := loadConfig(context.GlobalString("config")) if err != nil && !os.IsNotExist(err) { return err - } else if err != nil && os.IsNotExist(err) { - log.G(global).Infof("config %q does not exist. Creating it.", context.GlobalString("config")) - fh, err := os.Create(context.GlobalString("config")) - if err != nil { - return err - } - if _, err := conf.WriteTo(fh); err != nil { - fh.Close() - return err - } - fh.Close() } - // the order for config vs flag values is that flags will always override // the config values if they are set if err := setLevel(context); err != nil {