0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #24450 from runcom/fix-systemd-defaultRuntime

Browse source 
daemon: ensure we set default options to stock runtime
This commit is contained in:
Alexander Morozov 2016-07-08 08:52:18 -07:00 • committed by GitHub
commit 9d10221a1c
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 {
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
}