diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-12 19:37:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-12 19:37:46 +0100 |
commit | 4808a63e5f1ad72d754c61c005c2c7c29ce48014 (patch) | |
tree | 3cfdd9e9f89024798a1bcd26dd56d4c7140d923d /pkg/cgroups/cgroups.go | |
parent | fd010adfdcb6f578623b77281f2ae012bcd1ac85 (diff) | |
parent | 7c98d542b4c5ab0495f66a9179ae886e86cad273 (diff) | |
download | podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.tar.gz podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.tar.bz2 podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.zip |
Merge pull request #12274 from mheon/bump_342
Bump to v3.4.2
Diffstat (limited to 'pkg/cgroups/cgroups.go')
-rw-r--r-- | pkg/cgroups/cgroups.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go index f1ef538e4..d0c090012 100644 --- a/pkg/cgroups/cgroups.go +++ b/pkg/cgroups/cgroups.go @@ -461,10 +461,10 @@ func (c *CgroupControl) CreateSystemdUnit(path string) error { return systemdCreate(path, conn) } -// GetUserConnection returns an user connection to D-BUS +// GetUserConnection returns a user connection to D-BUS func GetUserConnection(uid int) (*systemdDbus.Conn, error) { return systemdDbus.NewConnection(func() (*dbus.Conn, error) { - return dbusAuthConnection(uid, dbus.SessionBusPrivate) + return dbusAuthConnection(uid, dbus.SessionBusPrivateNoAutoStartup) }) } |