security/hakurei
6
3
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

container/path: fhs path constants
All checks were successful
Test / Create distribution (push) Successful in 33s
Details
Test / Sandbox (push) Successful in 2m6s
Details
Test / Hakurei (push) Successful in 3m6s
Details
Test / Sandbox (race detector) (push) Successful in 4m14s
Details
Test / Hpkg (push) Successful in 4m11s
Details
Test / Hakurei (race detector) (push) Successful in 4m40s
Details
Test / Flake checks (push) Successful in 1m18s
Details

Browse Source 
This increases readability since this can help disambiguate absolute paths from similarly named path segments.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-08-03 20:46:41 +09:00
parent 38245559dc
commit c6be82bcf9
23 changed files with 164 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/hpkg/with.go
View File

@@ -5,6 +5,7 @@ import (
"path"
"strings"
"hakurei.app/container"
"hakurei.app/container/seccomp"
"hakurei.app/hst"
"hakurei.app/internal"
@@ -52,9 +53,9 @@ func withNixDaemon(
{Src: pathSet.nixPath, Dst: "/nix", Write: true, Must: true},
},
Link: [][2]string{
{app.CurrentSystem, "/run/current-system"},
{"/run/current-system/sw/bin", "/bin"},
{"/run/current-system/sw/bin", "/usr/bin"},
{app.CurrentSystem, container.FHSRun + "current-system"},
{container.FHSRun + "current-system/sw/bin", "/bin"},
{container.FHSRun + "current-system/sw/bin", container.FHSUsrBin},
},
Etc: path.Join(pathSet.cacheDir, "etc"),
AutoEtc: true,
@@ -93,11 +94,11 @@ func withCacheDir(
{Src: workDir, Dst: path.Join(hst.Tmp, "bundle"), Must: true},
},
Link: [][2]string{
{app.CurrentSystem, "/run/current-system"},
{"/run/current-system/sw/bin", "/bin"},
{"/run/current-system/sw/bin", "/usr/bin"},
{app.CurrentSystem, container.FHSRun + "current-system"},
{container.FHSRun + "current-system/sw/bin", "/bin"},
{container.FHSRun + "current-system/sw/bin", container.FHSUsrBin},
},
Etc: path.Join(workDir, "etc"),
Etc: path.Join(workDir, container.FHSEtc),
AutoEtc: true,
},
}, dropShell, beforeFail)