diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 6df84164a0..afeaedc34e 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -579,7 +579,11 @@ func verifyDaemonSettings(config *Config) error { if config.Runtimes == nil { config.Runtimes = make(map[string]types.Runtime) } - config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary} + stockRuntimeOpts := []string{} + if UsingSystemd(config) { + stockRuntimeOpts = append(stockRuntimeOpts, "--systemd-cgroup=true") + } + config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary, Args: stockRuntimeOpts} return nil }