From 87f60bbfaab89cddd8c44b1b3b4c3ee8c4d33ced Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jul 2020 08:58:50 +0000
Subject: Bump github.com/containers/common from 0.17.0 to 0.18.0

Bumps [github.com/containers/common](https://github.com/containers/common) from 0.17.0 to 0.18.0.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.17.0...v0.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 vendor/github.com/containers/common/pkg/config/systemd.go | 10 ++++++++++
 vendor/github.com/containers/common/version/version.go    |  2 +-
 vendor/modules.txt                                        |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'vendor')

diff --git a/vendor/github.com/containers/common/pkg/config/systemd.go b/vendor/github.com/containers/common/pkg/config/systemd.go
index e02f52192..02e5c4ac2 100644
--- a/vendor/github.com/containers/common/pkg/config/systemd.go
+++ b/vendor/github.com/containers/common/pkg/config/systemd.go
@@ -2,7 +2,17 @@
 
 package config
 
+import (
+	"github.com/containers/common/pkg/cgroupv2"
+	"github.com/containers/storage/pkg/unshare"
+)
+
 func defaultCgroupManager() string {
+	enabled, err := cgroupv2.Enabled()
+	if err == nil && !enabled && unshare.IsRootless() {
+		return CgroupfsCgroupsManager
+	}
+
 	return SystemdCgroupsManager
 }
 func defaultEventsLogger() string {
diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go
index 2913fe974..6b226eabe 100644
--- a/vendor/github.com/containers/common/version/version.go
+++ b/vendor/github.com/containers/common/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // Version is the version of the build.
-const Version = "0.17.0"
+const Version = "0.18.0"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1d97f810a..7cd0f86df 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -84,7 +84,7 @@ github.com/containers/buildah/pkg/secrets
 github.com/containers/buildah/pkg/supplemented
 github.com/containers/buildah/pkg/umask
 github.com/containers/buildah/util
-# github.com/containers/common v0.17.0
+# github.com/containers/common v0.18.0
 github.com/containers/common/pkg/apparmor
 github.com/containers/common/pkg/auth
 github.com/containers/common/pkg/capabilities
-- 
cgit v1.2.3-54-g00ecf