cgroups: use SessionBusPrivateNoAutoStartup

giuseppe · giuseppe · commit b8c92ca197bd · 2022-12-16T09:56:14.000+01:00
do not start up a dbus daemon if it is not already running. [NO NEW TESTS NEEDED] the fix is in a dependency. Closes: containers/podman#16718 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> (cherry picked from commit 12a939e)
diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go
@@ -432,7 +432,7 @@ func (c *CgroupControl) CreateSystemdUnit(path string) error {
 // GetUserConnection returns an 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)
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ func (c *CgroupControl) CreateSystemdUnit(path string) error {`
`432`	`432`	`// GetUserConnection returns an user connection to D-BUS`
`433`	`433`	`func GetUserConnection(uid int) (*systemdDbus.Conn, error) {`
`434`	`434`	`return systemdDbus.NewConnection(func() (*dbus.Conn, error) {`
`435`		`- return dbusAuthConnection(uid, dbus.SessionBusPrivate)`
	`435`	`+ return dbusAuthConnection(uid, dbus.SessionBusPrivateNoAutoStartup)`
`436`	`436`	`})`
`437`	`437`	`}`
`438`	`438`