summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2021-10-26 21:05:42 +0200
committerMatthew Heon <matthew.heon@pm.me>2021-11-12 11:08:25 -0500
commit0e1f67b725088c4d7425f56e260ddbb44078d11b (patch)
treebdf31b20c1b87bb1b9526e596b893ca0feb1adea
parent9707ff5d49b46deafc32fcfb1ca9fc3c8575c693 (diff)
downloadpodman-0e1f67b725088c4d7425f56e260ddbb44078d11b.tar.gz
podman-0e1f67b725088c4d7425f56e260ddbb44078d11b.tar.bz2
podman-0e1f67b725088c4d7425f56e260ddbb44078d11b.zip
cgroups: use SessionBusPrivateNoAutoStartup
do not start up a dbus daemon if it is not already running. [NO NEW TESTS NEEDED] the fix is in a dependency. Closes: https://github.com/containers/podman/issues/9727 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--pkg/cgroups/cgroups.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go
index 1debc020c..d0c090012 100644
--- a/pkg/cgroups/cgroups.go
+++ b/pkg/cgroups/cgroups.go
@@ -464,7 +464,7 @@ func (c *CgroupControl) CreateSystemdUnit(path string) error {
// 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)
})
}