jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1808 from AkihiroSuda/fix-bad-merge 

Fix merge conflict
This commit is contained in:
Michael Crosby 2018-05-30 10:51:18 -04:00 committed by GitHub
parent 0e561642f8 63bb0fe9d0
commit ecd55a4135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils_linux.go
View File

@ -39,7 +39,11 @@ func loadFactory(context *cli.Context) (libcontainer.Factory, error) {
// We default to cgroupfs, and can only use systemd if the system is a
// systemd box.
cgroupManager := libcontainer.Cgroupfs
if isRootless() {
rootless, err := isRootless(context)
if err != nil {
return nil, err
}
if rootless {
cgroupManager = libcontainer.RootlessCgroupfs
}
if context.GlobalBool("systemd-cgroup") {