From f9bf20a3c75d01cf597477231f9bbb61f15cd4fd Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 15 Mar 2025 01:02:18 +0900 Subject: helper: rearrange initialisation args This improves consistency across two different helper implementations. Signed-off-by: Ophestra --- internal/app/shim/main.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'internal') diff --git a/internal/app/shim/main.go b/internal/app/shim/main.go index 5690f8f6..c7c853be 100644 --- a/internal/app/shim/main.go +++ b/internal/app/shim/main.go @@ -128,13 +128,11 @@ func Main() { ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) defer stop() // unreachable if b, err := helper.NewBwrap( - ctx, - conf, path.Join(fst.Tmp, "sbin/init0"), false, - nil, func(int, int) []string { return make([]string, 0) }, + ctx, path.Join(fst.Tmp, "sbin/init0"), + nil, false, + 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, + conf, false, extraFiles, syncFd, ); err != nil { log.Fatalf("malformed sandbox config: %v", err) } else { -- cgit v1.3.1