Merge pull request moby#48355 from thaJeztah/libcontainer_consolidate…

…_defaults_step2

libcontainerd/supervisor: set log-level through the config-file

libcontainerd/supervisor/remote_daemon.go

@@ -47,10 +47,6 @@ type remote struct {
 	daemonWaitCh  chan struct{}
 	daemonStartCh chan error
 	daemonStopCh  chan struct{}
-
-	// logLevel overrides the containerd logging-level through the --log-level
-	// command-line option.
-	logLevel string
 }
 
 // Daemon represents a running containerd daemon
@@ -159,13 +155,8 @@ func (r *remote) startContainerd() error {
 	if err != nil {
 		return err
 	}
-	args := []string{"--config", cfgFile}
-
-	if r.logLevel != "" {
-		args = append(args, "--log-level", r.logLevel)
-	}
 
-	cmd := exec.Command(binaryName, args...)
+	cmd := exec.Command(binaryName, "--config", cfgFile)
 	// redirect containerd logs to docker logs
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

libcontainerd/supervisor/remote_daemon_options.go

@@ -12,7 +12,7 @@ func WithLogLevel(lvl string) DaemonOpt {
 			// so don't pass the default.
 			lvl = ""
 		}
-		r.logLevel = lvl
+		r.Config.Debug.Level = lvl
 		return nil
 	}
 }