aboutsummaryrefslogtreecommitdiffhomepage
path: root/system
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2025-03-17 00:13:14 +0900
committerOphestra <cat@gensokyo.uk>2025-03-17 00:13:14 +0900
commit44277dc0f1fd1806f5ceea34246a4c805a06b61b (patch)
tree568e10c40ebace8e7fdf39c5afd5625db45e7729 /system
parentbc54db54d2b33e5ed29667be69d0c07eed9bb007 (diff)
dbus: run in native sandbox
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'system')
-rw-r--r--system/dbus.go14
1 files changed, 11 insertions, 3 deletions
diff --git a/system/dbus.go b/system/dbus.go
index 5f62b2e4..b44936c3 100644
--- a/system/dbus.go
+++ b/system/dbus.go
@@ -88,7 +88,7 @@ func (d *DBus) apply(sys *I) error {
return sys.wrapErrSuffix(err,
"cannot start message bus proxy:")
}
- sys.println("starting message bus proxy:", d.proxy)
+ sys.println("starting message bus proxy", d.proxy)
return nil
}
@@ -139,7 +139,15 @@ func (s *scanToFmsg) write(p []byte, a int) (int, error) {
return a + n, nil
} else {
n, _ := s.msg.Write(p[:i])
- s.msgbuf = append(s.msgbuf, s.msg.String())
+
+ // allow container init messages through
+ v := s.msg.String()
+ if strings.HasPrefix(v, "init: ") {
+ log.Println("(dbus) " + v)
+ } else {
+ s.msgbuf = append(s.msgbuf, v)
+ }
+
s.msg.Reset()
return s.write(p[i+1:], a+n+1)
}
@@ -148,7 +156,7 @@ func (s *scanToFmsg) write(p []byte, a int) (int, error) {
func (s *scanToFmsg) Dump() {
s.mu.RLock()
for _, msg := range s.msgbuf {
- log.Println(msg)
+ log.Println("(dbus) " + msg)
}
s.mu.RUnlock()
}