diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-10-05 17:40:32 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-10-05 17:40:32 +0900 |
| commit | ae7b343cde93bf59d2e3c7f6316d41c1474dd081 (patch) | |
| tree | 5f07c90b493f38fe238c347ab2eb121d5350e81c /internal/app/shim.go | |
| parent | a63a372fe07a35fc355f54e72bbace47f157406c (diff) | |
hst: reword and move constants
These values are considered part of the stable, exported API, so move them to hst.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/app/shim.go')
| -rw-r--r-- | internal/app/shim.go | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/internal/app/shim.go b/internal/app/shim.go index de53b975..4927f5c5 100644 --- a/internal/app/shim.go +++ b/internal/app/shim.go @@ -15,6 +15,7 @@ import ( "hakurei.app/container" "hakurei.app/container/seccomp" + "hakurei.app/hst" ) //#include "shim-signal.h" @@ -23,27 +24,21 @@ import "C" const shimEnv = "HAKUREI_SHIM" type shimParams struct { - // monitor pid, checked against ppid in signal handler + // Priv side pid, checked against ppid in signal handler for the syscall.SIGCONT hack. Monitor int - // duration to wait for after interrupting a container's initial process before the container is killed; - // zero value defaults to [DefaultShimWaitDelay], values exceeding [MaxShimWaitDelay] becomes [MaxShimWaitDelay] + // Duration to wait for after interrupting a container's initial process before the container is killed. + // Limits are enforced on the priv side. WaitDelay time.Duration - // finalised container params + // Finalised container params. + // TODO(ophestra): transmit outcomeState instead (params to shim) Container *container.Params - // verbosity pass through + // Verbosity pass through. Verbose bool } -const ( - // ShimExitRequest is returned when the monitor process requests shim exit. - ShimExitRequest = 254 - // ShimExitOrphan is returned when the shim is orphaned before monitor delivers a signal. - ShimExitOrphan = 3 -) - // ShimMain is the main function of the shim process and runs as the unconstrained target user. func ShimMain() { log.SetPrefix("shim: ") @@ -107,12 +102,12 @@ func ShimMain() { // setup has not completed, terminate immediately msg.Resume() - os.Exit(ShimExitRequest) + os.Exit(hst.ShimExitRequest) return case 1: // got SIGCONT after adoption: monitor died before delivering signal msg.BeforeExit() - os.Exit(ShimExitOrphan) + os.Exit(hst.ShimExitOrphan) return case 2: // unreachable |