diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-10-11 14:29:38 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-10-11 14:32:35 +0900 |
| commit | f5a597c4061b18b53e3124107c0e1434a98aedc9 (patch) | |
| tree | d339acafed909f5ec30bc6344d7c76322a0b9bd1 /cmd/hpkg | |
| parent | 8874aaf81b6d8028bd4dc3d4a1f09bf16b349085 (diff) | |
hst: rename /.hakurei constant
This provides disambiguation from fhs.AbsTmp.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd/hpkg')
| -rw-r--r-- | cmd/hpkg/app.go | 2 | ||||
| -rw-r--r-- | cmd/hpkg/main.go | 4 | ||||
| -rw-r--r-- | cmd/hpkg/with.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/hpkg/app.go b/cmd/hpkg/app.go index e8bd8b99..d03c8b03 100644 --- a/cmd/hpkg/app.go +++ b/cmd/hpkg/app.go @@ -91,7 +91,7 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *check.Absolute, argv [] {FilesystemConfig: &hst.FSLink{Target: pathCurrentSystem, Linkname: app.CurrentSystem.String()}}, {FilesystemConfig: &hst.FSLink{Target: pathBin, Linkname: pathSwBin.String()}}, {FilesystemConfig: &hst.FSLink{Target: fhs.AbsUsrBin, Linkname: pathSwBin.String()}}, - {FilesystemConfig: &hst.FSBind{Source: pathSet.metaPath, Target: hst.AbsTmp.Append("app")}}, + {FilesystemConfig: &hst.FSBind{Source: pathSet.metaPath, Target: hst.AbsPrivateTmp.Append("app")}}, {FilesystemConfig: &hst.FSBind{Source: fhs.AbsEtc.Append("resolv.conf"), Optional: true}}, {FilesystemConfig: &hst.FSBind{Source: fhs.AbsSys.Append("block"), Optional: true}}, {FilesystemConfig: &hst.FSBind{Source: fhs.AbsSys.Append("bus"), Optional: true}}, diff --git a/cmd/hpkg/main.go b/cmd/hpkg/main.go index e3346bff..757dc144 100644 --- a/cmd/hpkg/main.go +++ b/cmd/hpkg/main.go @@ -162,7 +162,7 @@ func main() { withCacheDir(ctx, msg, "install", []string{ // export inner bundle path in the environment - "export BUNDLE=" + hst.Tmp + "/bundle", + "export BUNDLE=" + hst.PrivateTmp + "/bundle", // replace inner /etc "mkdir -p etc", "chmod -R +w etc", @@ -309,7 +309,7 @@ func main() { if a.GPU { config.Container.Filesystem = append(config.Container.Filesystem, - hst.FilesystemConfigJSON{FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath.Append(".nixGL"), Target: hst.AbsTmp.Append("nixGL")}}) + hst.FilesystemConfigJSON{FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath.Append(".nixGL"), Target: hst.AbsPrivateTmp.Append("nixGL")}}) appendGPUFilesystem(config) } diff --git a/cmd/hpkg/with.go b/cmd/hpkg/with.go index cb86f502..5cb1533e 100644 --- a/cmd/hpkg/with.go +++ b/cmd/hpkg/with.go @@ -88,7 +88,7 @@ func withCacheDir( {FilesystemConfig: &hst.FSLink{Target: pathCurrentSystem, Linkname: app.CurrentSystem.String()}}, {FilesystemConfig: &hst.FSLink{Target: pathBin, Linkname: pathSwBin.String()}}, {FilesystemConfig: &hst.FSLink{Target: fhs.AbsUsrBin, Linkname: pathSwBin.String()}}, - {FilesystemConfig: &hst.FSBind{Source: workDir, Target: hst.AbsTmp.Append("bundle")}}, + {FilesystemConfig: &hst.FSBind{Source: workDir, Target: hst.AbsPrivateTmp.Append("bundle")}}, {FilesystemConfig: &hst.FSBind{Target: pathDataData.Append(app.ID, "cache"), Source: pathSet.cacheDir, Write: true, Ensure: true}}, }, |