opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-17 03:04:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

utils: use the user session for systemd

Browse Source 
when running as rootless, use the user session bus.  It is already
implemented in the pkg/cgroups so just re-use it.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-09-06 15:29:03 +02:00
parent 79ebb5f254
commit b94a5e2410
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/utils_supported.go
View File

@ -3,6 +3,8 @@
package utils package utils
import ( import (
"github.com/containers/libpod/pkg/cgroups"
"github.com/containers/libpod/pkg/rootless"
systemdDbus "github.com/coreos/go-systemd/dbus" systemdDbus "github.com/coreos/go-systemd/dbus"
"github.com/godbus/dbus" "github.com/godbus/dbus"
) )
@ -10,10 +12,20 @@ import (
// RunUnderSystemdScope adds the specified pid to a systemd scope // RunUnderSystemdScope adds the specified pid to a systemd scope
func RunUnderSystemdScope(pid int, slice string, unitName string) error { func RunUnderSystemdScope(pid int, slice string, unitName string) error {
var properties []systemdDbus.Property var properties []systemdDbus.Property
conn, err := systemdDbus.New() var conn *systemdDbus.Conn
var err error
if rootless.IsRootless() {
conn, err = cgroups.GetUserConnection(rootless.GetRootlessUID())
if err != nil { if err != nil {
return err return err
} }
} else {
conn, err = systemdDbus.New()
if err != nil {
return err
}
}
properties = append(properties, systemdDbus.PropSlice(slice)) properties = append(properties, systemdDbus.PropSlice(slice))
properties = append(properties, newProp("PIDs", []uint32{uint32(pid)})) properties = append(properties, newProp("PIDs", []uint32{uint32(pid)}))
properties = append(properties, newProp("Delegate", true)) properties = append(properties, newProp("Delegate", true))