docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

daemon: ensure we set default options to stock runtime 

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 59162641cc20640afb785540b5f47178835de656)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Antonio Murdaca 2016-07-08 15:58:06 +02:00 committed by Tibor Vass
parent 234861710f
commit 52ca6cb63a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/daemon_unix.go
View File

@ -579,7 +579,11 @@ func verifyDaemonSettings(config *Config) error {
if config.Runtimes == nil { if config.Runtimes == nil {
config.Runtimes = make(map[string]types.Runtime) 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 return nil
} }