From 63bb0fe9d001cdad7b43621aa2072b294e7f1cd3 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Date: Wed, 30 May 2018 11:25:43 +0900
Subject: [PATCH] Fix merge conflict

Caused by:
* #1688 0e561642f81e84ebd0b3afd6ec510c75a2ccb71b
* #1759 dd67ab10d7e911d20082e268ba7a6956bb1f99b5

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
---
 utils_linux.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/utils_linux.go b/utils_linux.go
index 66fb97c9bf6..3944eb4b540 100644
--- 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") {