diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-06-17 02:59:48 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-06-17 02:59:48 +0900 |
| commit | 08112f0b906947bbaf82e450b19c5e0ea8b3fb4d (patch) | |
| tree | dc14cb72cd6d77cf91fdd73fef19dea9356edded /internal | |
| parent | e1a1e1e3996b4a7669de6b3c70fb0750d1841311 (diff) | |
hst: optionally cover /run/ early
This works around awkward root permissions.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/outcome/run_test.go | 1 | ||||
| -rw-r--r-- | internal/outcome/shim_test.go | 1 | ||||
| -rw-r--r-- | internal/outcome/spruntime.go | 3 | ||||
| -rw-r--r-- | internal/outcome/spruntime_test.go | 4 |
4 files changed, 9 insertions, 0 deletions
diff --git a/internal/outcome/run_test.go b/internal/outcome/run_test.go index 77738641..faa322ec 100644 --- a/internal/outcome/run_test.go +++ b/internal/outcome/run_test.go @@ -136,6 +136,7 @@ func TestOutcomeRun(t *testing.T) { Tmpfs(fhs.AbsDevShm, 0, 01777). // spRuntimeOp + Tmpfs(fhs.AbsRun, xdgRuntimeDirSize, 0755). Tmpfs(fhs.AbsRunUser, xdgRuntimeDirSize, 0755). Bind(m("/tmp/hakurei.0/runtime/9"), m("/run/user/1971"), std.BindWritable). diff --git a/internal/outcome/shim_test.go b/internal/outcome/shim_test.go index 6d9a9f3d..2dc7a4cd 100644 --- a/internal/outcome/shim_test.go +++ b/internal/outcome/shim_test.go @@ -71,6 +71,7 @@ func TestShimEntrypoint(t *testing.T) { Tmpfs(fhs.AbsDevShm, 0, 01777). // spRuntimeOp + Tmpfs(fhs.AbsRun, xdgRuntimeDirSize, 0755). Tmpfs(fhs.AbsRunUser, xdgRuntimeDirSize, 0755). Bind(m("/tmp/hakurei.10/runtime/9999"), m("/run/user/1000"), std.BindWritable). diff --git a/internal/outcome/spruntime.go b/internal/outcome/spruntime.go index 15974a44..c08bfe81 100644 --- a/internal/outcome/spruntime.go +++ b/internal/outcome/spruntime.go @@ -113,6 +113,9 @@ func (s *spRuntimeOp) toContainer(state *outcomeStateParams) error { } + if state.Container.Flags&hst.FCoverRun != 0 { + state.params.Tmpfs(fhs.AbsRun, xdgRuntimeDirSize, 0755) + } state.params.Tmpfs(fhs.AbsRunUser, xdgRuntimeDirSize, 0755) if state.Container.Flags&hst.FShareRuntime != 0 { _, runtimeDirInst := s.commonPaths(state.outcomeState) diff --git a/internal/outcome/spruntime_test.go b/internal/outcome/spruntime_test.go index e083f7c3..25f2684c 100644 --- a/internal/outcome/spruntime_test.go +++ b/internal/outcome/spruntime_test.go @@ -40,6 +40,7 @@ func TestSpRuntimeOp(t *testing.T) { // this op configures the container state and does not make calls during toContainer }, &container.Params{ Ops: new(container.Ops). + Tmpfs(fhs.AbsRun, xdgRuntimeDirSize, 0755). Tmpfs(fhs.AbsRunUser, xdgRuntimeDirSize, 0755). Bind(m("/proc/nonexistent/tmp/hakurei.0/runtime/9"), m("/run/user/1000"), std.BindWritable), }, paramsWantEnv(config, map[string]string{ @@ -67,6 +68,7 @@ func TestSpRuntimeOp(t *testing.T) { // this op configures the container state and does not make calls during toContainer }, &container.Params{ Ops: new(container.Ops). + Tmpfs(fhs.AbsRun, xdgRuntimeDirSize, 0755). Tmpfs(fhs.AbsRunUser, xdgRuntimeDirSize, 0755). Bind(m("/proc/nonexistent/tmp/hakurei.0/runtime/9"), m("/run/user/1000"), std.BindWritable), }, paramsWantEnv(config, map[string]string{ @@ -94,6 +96,7 @@ func TestSpRuntimeOp(t *testing.T) { // this op configures the container state and does not make calls during toContainer }, &container.Params{ Ops: new(container.Ops). + Tmpfs(fhs.AbsRun, xdgRuntimeDirSize, 0755). Tmpfs(fhs.AbsRunUser, xdgRuntimeDirSize, 0755). Bind(m("/proc/nonexistent/tmp/hakurei.0/runtime/9"), m("/run/user/1000"), std.BindWritable), }, paramsWantEnv(config, map[string]string{ @@ -117,6 +120,7 @@ func TestSpRuntimeOp(t *testing.T) { // this op configures the container state and does not make calls during toContainer }, &container.Params{ Ops: new(container.Ops). + Tmpfs(fhs.AbsRun, xdgRuntimeDirSize, 0755). Tmpfs(fhs.AbsRunUser, xdgRuntimeDirSize, 0755). Bind(m("/proc/nonexistent/tmp/hakurei.0/runtime/9"), m("/run/user/1000"), std.BindWritable), }, paramsWantEnv(config, map[string]string{ |