internal/app: relocate params state initialisation
All checks were successful
Test / Create distribution (push) Successful in 35s
Test / Sandbox (push) Successful in 2m13s
Test / Hakurei (push) Successful in 3m5s
Test / Hpkg (push) Successful in 4m9s
Test / Hakurei (race detector) (push) Successful in 5m18s
Test / Sandbox (race detector) (push) Successful in 2m9s
Test / Flake checks (push) Successful in 1m40s

This is useful for testing.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2025-10-10 21:59:16 +09:00
parent 24de7c50a0
commit 070e346587
3 changed files with 24 additions and 24 deletions

View File

@@ -5,7 +5,6 @@ import (
"errors"
"io"
"log"
"maps"
"os"
"os/exec"
"os/signal"
@@ -102,15 +101,9 @@ func ShimMain() {
log.Fatalf("cannot set parent-death signal: %v", errno)
}
var params container.Params
stateParams := outcomeStateParams{params: &params, outcomeState: &state}
if state.Container.Env == nil {
stateParams.env = make(map[string]string, envAllocSize)
} else {
stateParams.env = maps.Clone(state.Container.Env)
}
stateParams := state.newParams()
for _, op := range state.Shim.Ops {
if err := op.toContainer(&stateParams); err != nil {
if err := op.toContainer(stateParams); err != nil {
if m, ok := message.GetMessage(err); ok {
log.Fatal(m)
} else {
@@ -130,7 +123,7 @@ func ShimMain() {
switch buf[0] {
case 0: // got SIGCONT from monitor: shim exit requested
if fp := cancelContainer.Load(); params.ForwardCancel && fp != nil && *fp != nil {
if fp := cancelContainer.Load(); stateParams.params.ForwardCancel && fp != nil && *fp != nil {
(*fp)()
// shim now bound by ShimWaitDelay, implemented below
continue
@@ -158,7 +151,7 @@ func ShimMain() {
}
}()
if params.Ops == nil {
if stateParams.params.Ops == nil {
log.Fatal("invalid container params")
}
@@ -171,7 +164,7 @@ func ShimMain() {
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
cancelContainer.Store(&stop)
z := container.New(ctx, msg)
z.Params = params
z.Params = *stateParams.params
z.Stdin, z.Stdout, z.Stderr = os.Stdin, os.Stdout, os.Stderr
// bounds and default enforced in finalise.go