diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-08-03 20:46:41 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-08-03 21:16:45 +0900 |
| commit | c6be82bcf91fc4b6e61d9df40213e80367addbd8 (patch) | |
| tree | ee245cf214ff845f0d8a3eac0cc1a6064107112d /hst | |
| parent | 38245559dca0833dc078b982d59490eee53e168c (diff) | |
container/path: fhs path constants
This increases readability since this can help disambiguate absolute paths from similarly named path segments.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'hst')
| -rw-r--r-- | hst/template.go | 28 | ||||
| -rw-r--r-- | hst/template_test.go | 4 |
2 files changed, 16 insertions, 16 deletions
diff --git a/hst/template.go b/hst/template.go index 5758462e..32d84cd4 100644 --- a/hst/template.go +++ b/hst/template.go @@ -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, }, } diff --git a/hst/template_test.go b/hst/template_test.go index 02ec7748..cf8ab81c 100644 --- a/hst/template_test.go +++ b/hst/template_test.go @@ -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 } }` |