aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/ipc')
-rw-r--r--pkg/ipc/ipc.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/ipc/ipc.go b/pkg/ipc/ipc.go
index d87cb8b0e..d6bae8af1 100644
--- a/pkg/ipc/ipc.go
+++ b/pkg/ipc/ipc.go
@@ -69,6 +69,13 @@ type ExecOpts struct {
SandboxArg int
}
+func (eo ExecOpts) MergeFlags(diff ExecOpts) ExecOpts {
+ ret := eo
+ ret.ExecFlags |= diff.ExecFlags
+ ret.EnvFlags |= diff.EnvFlags
+ return ret
+}
+
// Config is the configuration for Env.
type Config struct {
// Path to executor binary.