hst: pass through adopt wait delay with bounds

This is a useful value to customise, primarily useful for test suites
but can also generally improve exit latency for stubborn applications.

Signed-off-by: Ophestra <cat@gensokyo.uk>

2 files changed, 16 insertions, 0 deletions

diff --git a/internal/outcome/outcome.go b/internal/outcome/outcome.go
index 414b421f..19ca9c7b 100644
--- a/internal/outcome/outcome.go
+++ b/internal/outcome/outcome.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"maps"
 	"strconv"
+	"time"
 
 	"hakurei.app/check"
 	"hakurei.app/container"
@@ -125,6 +126,14 @@ func newOutcomeState(k syscallDispatcher, msg message.Msg, id *hst.ID, config *h
 		s.Shim.WaitDelay = s.Container.WaitDelay
 	}
 
+	if s.Container.AdoptWaitDelay > 5*time.Second {
+		s.Shim.AdoptWaitDelay = 5 * time.Second
+	} else if s.Container.AdoptWaitDelay < 0 {
+		s.Shim.AdoptWaitDelay = -1
+	} else {
+		s.Shim.AdoptWaitDelay = s.Container.AdoptWaitDelay
+	}
+
 	if s.Container.Flags&hst.FMapRealUID != 0 {
 		s.Mapuid, s.Mapgid = k.getuid(), k.getgid()
 	} else {
diff --git a/internal/outcome/shim.go b/internal/outcome/shim.go
index 6e039b65..2e7b0910 100644
--- a/internal/outcome/shim.go
+++ b/internal/outcome/shim.go
@@ -72,6 +72,12 @@ type shimParams struct {
 	// Limits are enforced on the priv side.
 	WaitDelay time.Duration
 
+	// Duration to wait after the initial process terminates before all
+	// lingering processes are killed.
+	//
+	// Limits are enforced on the priv side.
+	AdoptWaitDelay time.Duration
+
 	// Verbosity pass through from [message.Msg].
 	Verbose bool
 
@@ -286,6 +292,7 @@ func shimEntrypoint(k syscallDispatcher) {
 
 	// bounds and default enforced in finalise.go
 	z.WaitDelay = state.Shim.WaitDelay
+	z.AdoptWaitDelay = state.Shim.AdoptWaitDelay
 
 	if stateParams.pipewirePulsePath != nil {
 		zpw := container.NewCommand(ctx, msg, stateParams.pipewirePulsePath, pipewirePulseName)