aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal/app/spdbus.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/app/spdbus.go')
-rw-r--r--internal/app/spdbus.go11
1 files changed, 5 insertions, 6 deletions
diff --git a/internal/app/spdbus.go b/internal/app/spdbus.go
index b818cbe9..c2c1fefe 100644
--- a/internal/app/spdbus.go
+++ b/internal/app/spdbus.go
@@ -13,8 +13,7 @@ func init() { gob.Register(new(spDBusOp)) }
// spDBusOp maintains an xdg-dbus-proxy instance for the container.
type spDBusOp struct {
- // Whether to bind the system bus socket.
- // Populated during toSystem.
+ // Whether to bind the system bus socket. Populated during toSystem.
ProxySystem bool
}
@@ -30,10 +29,10 @@ func (s *spDBusOp) toSystem(state *outcomeStateSys) error {
// downstream socket paths
sessionPath, systemPath := state.instance().Append("bus"), state.instance().Append("system_bus_socket")
- if err := state.sys.ProxyDBus(
- state.sessionBus, state.systemBus,
- sessionPath, systemPath,
- ); err != nil {
+ var sessionBus, systemBus dbus.ProxyPair
+ sessionBus[0], systemBus[0] = state.k.dbusAddress()
+ sessionBus[1], systemBus[1] = sessionPath.String(), systemPath.String()
+ if err := state.sys.ProxyDBus(state.sessionBus, state.systemBus, sessionBus, systemBus); err != nil {
return err
}