diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-22 18:54:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 18:54:27 +0200 |
| commit | 2d24487ba244e5cd900f6aecc5d8896e1354d1ee (patch) | |
| tree | c52c30a688b77d37fa944cc52118d033d4a9b97d /vendor/github.com | |
| parent | ff31cdc5588b6ae41e4ecd578e829da90ba64346 (diff) | |
| parent | 9e7c7211c4bdffb3582f635ecd05f1e88e99b5a8 (diff) | |
| download | podman-2d24487ba244e5cd900f6aecc5d8896e1354d1ee.tar.gz podman-2d24487ba244e5cd900f6aecc5d8896e1354d1ee.tar.bz2 podman-2d24487ba244e5cd900f6aecc5d8896e1354d1ee.zip | |
Merge pull request #7049 from mheon/update_c_common
Bump github.com/containers/common to v0.14.6
Diffstat (limited to 'vendor/github.com')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/systemd.go | 10 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/version/version.go | 2 |
2 files changed, 11 insertions, 1 deletions
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 d5004c60a..d3f67d04c 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.14.4" +const Version = "0.14.6" |