kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

daemon: ensure systemd cgroup is passed down to runtimes 

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-08-26 15:33:26 +02:00
parent 91fdafb79f
commit 7f88fca48e
No known key found for this signature in database
GPG Key ID: B2BEAD150DE936B9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/daemon_unix.go
View File

@ -566,11 +566,7 @@ func verifyDaemonSettings(config *Config) error {
if config.Runtimes == nil {
config.Runtimes = make(map[string]types.Runtime)
}
stockRuntimeOpts := []string{}
if UsingSystemd(config) {
stockRuntimeOpts = append(stockRuntimeOpts, "--systemd-cgroup=true")
}
config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary, Args: stockRuntimeOpts}
config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary}
return nil
}

3
daemon/start_linux.go
View File

@ -20,6 +20,9 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
if rt == nil {
return nil, fmt.Errorf("no such runtime '%s'", container.HostConfig.Runtime)
}
if UsingSystemd(daemon.configStore) {
rt.Args = append(rt.Args, "--systemd-cgroup=true")
}
createOptions = append(createOptions, libcontainerd.WithRuntime(rt.Path, rt.Args))
return &createOptions, nil