aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2025-03-15 00:27:44 +0900
committerOphestra <cat@gensokyo.uk>2025-03-15 00:27:44 +0900
commitf443d315ad60d761c06135569abb0adb183ac8c1 (patch)
treee22b866dc239cd888ef7f3d2ffadaf6a14bd51aa /internal
parent9e18d1de77b2c9bb24a51c2e99b060c6d06818ee (diff)
helper: clean up interface
The helper interface was messy due to odd context acquisition order. That has changed, so this cleans it up. Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
-rw-r--r--internal/app/shim/main.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/app/shim/main.go b/internal/app/shim/main.go
index 9855535a..5690f8f6 100644
--- a/internal/app/shim/main.go
+++ b/internal/app/shim/main.go
@@ -131,15 +131,15 @@ func Main() {
ctx,
conf, path.Join(fst.Tmp, "sbin/init0"), false,
nil, func(int, int) []string { return make([]string, 0) },
+ func(cmd *exec.Cmd) { cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr },
extraFiles,
syncFd,
+ false,
); err != nil {
log.Fatalf("malformed sandbox config: %v", err)
} else {
- b.SetStdin(os.Stdin).SetStdout(os.Stdout).SetStderr(os.Stderr)
-
// run and pass through exit code
- if err = b.Start(false); err != nil {
+ if err = b.Start(); err != nil {
log.Fatalf("cannot start target process: %v", err)
} else if err = b.Wait(); err != nil {
var exitError *exec.ExitError