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

Merge pull request #40666 from AkihiroSuda/prohibit-rootless-systemd-cgroup1

Browse source 
daemon: fail early if rootless && cgroupdriver == "systemd" && cgroup v1
This commit is contained in:
Sebastiaan van Stijn 2020-03-13 22:29:04 +01:00 • committed by GitHub
commit 1e078e1ac5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/daemon_unix.go
View file

@ -791,6 +791,10 @@ func verifyDaemonSettings(conf *config.Config) error {
}
}
if conf.Rootless && UsingSystemd(conf) && !cgroups.IsCgroup2UnifiedMode() {
return fmt.Errorf("exec-opt native.cgroupdriver=systemd requires cgroup v2 for rootless mode")
}
if conf.DefaultRuntime == "" {
conf.DefaultRuntime = config.StockRuntimeName
}