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

Fix merge conflict
opencontainers · May 30, 2018 · ecd55a4 · ecd55a4
2 parents 0e56164 + 63bb0fe
commit ecd55a4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/utils_linux.go b/utils_linux.go
@@ -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") {