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

28
hst/template.go
View File

@@ -12,7 +12,7 @@ func Template() *Config {
return &Config{
ID: "org.chromium.Chromium",
Path: "/run/current-system/sw/bin/chromium",
Path: container.FHSRun + "current-system/sw/bin/chromium",
Args: []string{
"chromium",
"--ignore-gpu-blocklist",
@@ -46,12 +46,12 @@ func Template() *Config {
DirectWayland: false,
Username: "chronos",
Shell: "/run/current-system/sw/bin/zsh",
Data: "/var/lib/hakurei/u0/org.chromium.Chromium",
Shell: container.FHSRun + "current-system/sw/bin/zsh",
Data: container.FHSVarLib + "hakurei/u0/org.chromium.Chromium",
Dir: "/data/data/org.chromium.Chromium",
ExtraPerms: []*ExtraPermConfig{
{Path: "/var/lib/hakurei/u0", Ensure: true, Execute: true},
{Path: "/var/lib/hakurei/u0/org.chromium.Chromium", Read: true, Write: true, Execute: true},
{Path: container.FHSVarLib + "hakurei/u0", Ensure: true, Execute: true},
{Path: container.FHSVarLib + "hakurei/u0/org.chromium.Chromium", Read: true, Write: true, Execute: true},
},
Identity: 9,
@@ -78,19 +78,19 @@ func Template() *Config {
"GOOGLE_DEFAULT_CLIENT_SECRET": "OTJgUOQcT7lO7GsGZq2G4IlT",
},
Filesystem: []*FilesystemConfig{
{Dst: "/tmp", Src: SourceTmpfs, Write: true},
{Dst: container.FHSTmp, Src: SourceTmpfs, Write: true},
{Src: "/nix/store"},
{Src: "/run/current-system"},
{Src: "/run/opengl-driver"},
{Src: "/var/db/nix-channels"},
{Src: "/var/lib/hakurei/u0/org.chromium.Chromium",
{Src: container.FHSRun + "current-system"},
{Src: container.FHSRun + "opengl-driver"},
{Src: container.FHSVar + "db/nix-channels"},
{Src: container.FHSVarLib + "hakurei/u0/org.chromium.Chromium",
Dst: "/data/data/org.chromium.Chromium", Write: true, Must: true},
{Src: "/dev/dri", Device: true},
{Src: container.FHSDev + "dri", Device: true},
},
Link: [][2]string{{"/run/user/65534", "/run/user/150"}},
AutoRoot: "/var/lib/hakurei/base/org.debian",
Link: [][2]string{{container.FHSRunUser + "65534", container.FHSRunUser + "150"}},
AutoRoot: container.FHSVarLib + "hakurei/base/org.debian",
RootFlags: container.BindWritable,
Etc: "/etc",
Etc: container.FHSEtc,
AutoEtc: true,
},
}

4
hst/template_test.go
View File

@@ -98,7 +98,7 @@ func TestTemplate(t *testing.T) {
"device": true,
"filesystem": [
{
"dst": "/tmp",
"dst": "/tmp/",
"src": "tmpfs",
"write": true
},
@@ -133,7 +133,7 @@ func TestTemplate(t *testing.T) {
],
"auto_root": "/var/lib/hakurei/base/org.debian",
"root_flags": 2,
"etc": "/etc",
"etc": "/etc/",
"auto_etc": true
}
}`