From 2eb3b1129bf73f8e2a0b46683af3139498fa89fd Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Wed, 14 Oct 2026 18:23:45 +0900
Subject: 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>
---
 cmd/hakurei/command.go      | 8 +++++++-
 cmd/hakurei/command_test.go | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'cmd')

diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go
index 76004d4f..f14945ad 100644
--- a/cmd/hakurei/command.go
+++ b/cmd/hakurei/command.go
@@ -106,7 +106,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr
 			flagSchedPolicy   string
 			flagSchedPriority int
 
-			flagPrivateRuntime, flagPrivateTmpdir bool
+			flagNoWait, flagPrivateRuntime, flagPrivateTmpdir bool
 
 			flagWayland, flagX11, flagDBus, flagPipeWire, flagPulse bool
 		)
@@ -194,6 +194,10 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr
 				},
 			}
 
+			if flagNoWait {
+				config.Container.AdoptWaitDelay = -1
+			}
+
 			if err := config.SchedPolicy.UnmarshalText(
 				[]byte(flagSchedPolicy),
 			); err != nil {
@@ -315,6 +319,8 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr
 				"Scheduling policy to set for the container").
 			Flag(&flagSchedPriority, "priority", command.IntFlag(0),
 				"Scheduling priority to set for the container").
+			Flag(&flagNoWait, "no-wait", command.BoolFlag(false),
+				"Do not wait for lingering processes to terminate").
 			Flag(&flagPrivateRuntime, "private-runtime", command.BoolFlag(false),
 				"Do not share XDG_RUNTIME_DIR between containers under the same identity").
 			Flag(&flagPrivateTmpdir, "private-tmpdir", command.BoolFlag(false),
diff --git a/cmd/hakurei/command_test.go b/cmd/hakurei/command_test.go
index 059e18b1..49a1f9d4 100644
--- a/cmd/hakurei/command_test.go
+++ b/cmd/hakurei/command_test.go
@@ -39,8 +39,8 @@ commands:
                     [--dbus-system <value>] [--mpris] [--dbus-log]
                     [--id <value>] [-a <int>] [-g <value>] [-d <value>]
                     [-u <value>] [--policy <value>] [--priority <int>]
-                    [--private-runtime] [--private-tmpdir] [--wayland] [-X]
-                    [--dbus] [--pipewire] [--pulse] <command> [<args>]
+                    [--no-wait] [--private-runtime] [--private-tmpdir]
+                    [--wayland] [-X] [--dbus] [--pipewire] [--pulse] <command> [<args>]
 
 flags:
   -X	Enable direct connection to X11
@@ -62,6 +62,8 @@ flags:
     	Reverse-DNS style Application identifier, leave empty to inherit instance identifier
   -mpris
     	Allow owning MPRIS D-Bus path, has no effect if custom config is available
+  -no-wait
+    	Do not wait for lingering processes to terminate
   -pipewire
     	Enable connection to PipeWire via SecurityContext
   -policy string
-- 
cgit v1.3.1