diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-12 05:39:55 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-14 02:23:33 +0000 |
| commit | 70b44848119def655b836efa47dbfebde32e1bcb (patch) | |
| tree | 6da09cbe1a9a81be65747d628fff65be2f172967 | |
| parent | 5d7b31da73bc3d9a3c0872fa912fef273b574e81 (diff) | |
| download | podman-70b44848119def655b836efa47dbfebde32e1bcb.tar.gz podman-70b44848119def655b836efa47dbfebde32e1bcb.tar.bz2 podman-70b44848119def655b836efa47dbfebde32e1bcb.zip | |
podman in rootless mode will only work with cgroupfs at this point.
If user does not pass in cgroup manager and running in rootless mode,
then we need to force the cgroupfs support until/unless we get support
for rootless systemd support.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1261
Approved by: mheon
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index 9d1347cc5..f1f2b963c 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions if c.GlobalIsSet("cgroup-manager") { options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager"))) + } else { + if rootless.IsRootless() { + options = append(options, libpod.WithCgroupManager("cgroupfs")) + } } // TODO flag to set libpod static dir? |