aboutsummaryrefslogtreecommitdiffhomepage
path: root/system/dbus/proc.go
diff options
context:
space:
mode:
Diffstat (limited to 'system/dbus/proc.go')
-rw-r--r--system/dbus/proc.go10
1 files changed, 1 insertions, 9 deletions
diff --git a/system/dbus/proc.go b/system/dbus/proc.go
index 879bc775..dfa42e28 100644
--- a/system/dbus/proc.go
+++ b/system/dbus/proc.go
@@ -36,9 +36,6 @@ func (p *Proxy) Start() error {
if !p.useSandbox {
p.helper = helper.NewDirect(ctx, p.name, p.final, true, argF, func(cmd *exec.Cmd) {
- if p.CmdF != nil {
- p.CmdF(cmd)
- }
if p.output != nil {
cmd.Stdout, cmd.Stderr = p.output, p.output
}
@@ -56,7 +53,7 @@ func (p *Proxy) Start() error {
}
var libPaths []string
- if entries, err := ldd.ExecFilter(ctx, p.CommandContext, p.FilterF, toolPath); err != nil {
+ if entries, err := ldd.Exec(ctx, toolPath); err != nil {
return err
} else {
libPaths = ldd.Path(entries)
@@ -69,15 +66,10 @@ func (p *Proxy) Start() error {
z.SeccompFlags |= seccomp.AllowMultiarch
z.SeccompPresets |= seccomp.PresetStrict
z.Hostname = "hakurei-dbus"
- z.CommandContext = p.CommandContext
if p.output != nil {
z.Stdout, z.Stderr = p.output, p.output
}
- if p.CmdF != nil {
- p.CmdF(z)
- }
-
// these lib paths are unpredictable, so mount them first so they cannot cover anything
for _, name := range libPaths {
z.Bind(name, name, 0)