security/hakurei
security/hakurei
5
2
Fork 0
Code Issues 10 Pull Requests Actions 1 Packages Projects Releases 7 Wiki Activity

hst: remove template bind nix store
All checks were successful
Test / Create distribution (push) Successful in 34s
Details
Test / Sandbox (push) Successful in 2m20s
Details
Test / Hakurei (push) Successful in 3m5s
Details
Test / Hpkg (push) Successful in 3m59s
Details
Test / Sandbox (race detector) (push) Successful in 4m35s
Details
Test / Hakurei (race detector) (push) Successful in 5m25s
Details
Test / Flake checks (push) Successful in 1m28s
Details

Browse Source 
This does not add anything meaningful to the template, since there are already prior examples showing src-only bind ops. Remove this since it causes confusion by covering the previous mount point targeting /nix/store.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-10-11 13:59:10 +09:00
parent 04a27c8e47
commit 8874aaf81b
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/hakurei/print_test.go
View File

@ -50,7 +50,6 @@ Filesystem
autoetc:/etc/ autoetc:/etc/
w+ephemeral(-rwxr-xr-x):/tmp/ w+ephemeral(-rwxr-xr-x):/tmp/
w*/nix/store:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work:/var/lib/hakurei/base/org.nixos/ro-store w*/nix/store:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work:/var/lib/hakurei/base/org.nixos/ro-store
*/nix/store
/run/current-system@ /run/current-system@
/run/opengl-driver@ /run/opengl-driver@
w-/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium w-/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium
@ -131,7 +130,6 @@ Filesystem
autoetc:/etc/ autoetc:/etc/
w+ephemeral(-rwxr-xr-x):/tmp/ w+ephemeral(-rwxr-xr-x):/tmp/
w*/nix/store:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work:/var/lib/hakurei/base/org.nixos/ro-store w*/nix/store:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work:/var/lib/hakurei/base/org.nixos/ro-store
*/nix/store
/run/current-system@ /run/current-system@
/run/opengl-driver@ /run/opengl-driver@
w-/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium w-/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium
@ -295,10 +293,6 @@ App
"upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper", "upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
"work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work" "work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
}, },
{
"type": "bind",
"src": "/nix/store"
},
{ {
"type": "link", "type": "link",
"dst": "/run/current-system", "dst": "/run/current-system",
@ -449,10 +443,6 @@ App
"upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper", "upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
"work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work" "work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
}, },
{
"type": "bind",
"src": "/nix/store"
},
{ {
"type": "link", "type": "link",
"dst": "/run/current-system", "dst": "/run/current-system",
@ -659,10 +649,6 @@ func TestPrintPs(t *testing.T) {
"upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper", "upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
"work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work" "work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
}, },
{
"type": "bind",
"src": "/nix/store"
},
{ {
"type": "link", "type": "link",
"dst": "/run/current-system", "dst": "/run/current-system",

1
hst/hst.go
View File

@ -121,7 +121,6 @@ func Template() *Config {
Upper: fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/upper"), Upper: fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/upper"),
Work: fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/work"), Work: fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/work"),
}}, }},
{&FSBind{Source: check.MustAbs("/nix/store")}},
{&FSLink{Target: fhs.AbsRun.Append("current-system"), Linkname: "/run/current-system", Dereference: true}}, {&FSLink{Target: fhs.AbsRun.Append("current-system"), Linkname: "/run/current-system", Dereference: true}},
{&FSLink{Target: fhs.AbsRun.Append("opengl-driver"), Linkname: "/run/opengl-driver", Dereference: true}}, {&FSLink{Target: fhs.AbsRun.Append("opengl-driver"), Linkname: "/run/opengl-driver", Dereference: true}},
{&FSBind{Source: fhs.AbsVarLib.Append("hakurei/u0/org.chromium.Chromium"), {&FSBind{Source: fhs.AbsVarLib.Append("hakurei/u0/org.chromium.Chromium"),

4
hst/hst_test.go
View File

@ -198,10 +198,6 @@ func TestTemplate(t *testing.T) {
"upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper", "upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
"work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work" "work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
}, },
{
"type": "bind",
"src": "/nix/store"
},
{ {
"type": "link", "type": "link",
"dst": "/run/current-system", "dst": "/run/current-system",