diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-08-25 22:21:16 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-08-25 22:23:54 +0900 |
| commit | 9585b35d5b4e91bb327e3eddb229d1b711eeec2f (patch) | |
| tree | 6480edb4c1ec02e31c84be82cf66c41e479731c7 /cmd/hpkg | |
| parent | 26cafe3e8066d9ae65230ff0aa17a5533cfa92f8 (diff) | |
hst/config: remove symlink field
Closes #6.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd/hpkg')
| -rw-r--r-- | cmd/hpkg/app.go | 8 | ||||
| -rw-r--r-- | cmd/hpkg/with.go | 16 |
2 files changed, 9 insertions, 15 deletions
diff --git a/cmd/hpkg/app.go b/cmd/hpkg/app.go index cd548dc8..37c114c8 100644 --- a/cmd/hpkg/app.go +++ b/cmd/hpkg/app.go @@ -96,6 +96,9 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg Filesystem: []hst.FilesystemConfigJSON{ {FilesystemConfig: &hst.FSBind{Target: container.AbsFHSEtc, Source: pathSet.cacheDir.Append("etc"), Special: true}}, {FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath.Append("store"), Target: pathNixStore}}, + {FilesystemConfig: &hst.FSLink{Target: pathCurrentSystem, Linkname: app.CurrentSystem.String()}}, + {FilesystemConfig: &hst.FSLink{Target: pathBin, Linkname: pathSwBin.String()}}, + {FilesystemConfig: &hst.FSLink{Target: container.AbsFHSUsrBin, Linkname: pathSwBin.String()}}, {FilesystemConfig: &hst.FSBind{Source: pathSet.metaPath, Target: hst.AbsTmp.Append("app")}}, {FilesystemConfig: &hst.FSBind{Source: container.AbsFHSEtc.Append("resolv.conf"), Optional: true}}, {FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("block"), Optional: true}}, @@ -104,11 +107,6 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg {FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("dev"), Optional: true}}, {FilesystemConfig: &hst.FSBind{Source: container.AbsFHSSys.Append("devices"), Optional: true}}, }, - Link: []hst.LinkConfig{ - {pathCurrentSystem, app.CurrentSystem.String()}, - {pathBin, pathSwBin.String()}, - {container.AbsFHSUsrBin, pathSwBin.String()}, - }, }, ExtraPerms: []*hst.ExtraPermConfig{ {Path: dataHome, Execute: true}, diff --git a/cmd/hpkg/with.go b/cmd/hpkg/with.go index 21adeec4..03b2e5f1 100644 --- a/cmd/hpkg/with.go +++ b/cmd/hpkg/with.go @@ -51,11 +51,9 @@ func withNixDaemon( Filesystem: []hst.FilesystemConfigJSON{ {FilesystemConfig: &hst.FSBind{Target: container.AbsFHSEtc, Source: pathSet.cacheDir.Append("etc"), Special: true}}, {FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath, Target: pathNix, Write: true}}, - }, - Link: []hst.LinkConfig{ - {pathCurrentSystem, app.CurrentSystem.String()}, - {pathBin, pathSwBin.String()}, - {container.AbsFHSUsrBin, pathSwBin.String()}, + {FilesystemConfig: &hst.FSLink{Target: pathCurrentSystem, Linkname: app.CurrentSystem.String()}}, + {FilesystemConfig: &hst.FSLink{Target: pathBin, Linkname: pathSwBin.String()}}, + {FilesystemConfig: &hst.FSLink{Target: container.AbsFHSUsrBin, Linkname: pathSwBin.String()}}, }, }, }), dropShell, beforeFail) @@ -90,13 +88,11 @@ func withCacheDir( Filesystem: []hst.FilesystemConfigJSON{ {FilesystemConfig: &hst.FSBind{Target: container.AbsFHSEtc, Source: workDir.Append(container.FHSEtc), Special: true}}, {FilesystemConfig: &hst.FSBind{Source: workDir.Append("nix"), Target: pathNix}}, + {FilesystemConfig: &hst.FSLink{Target: pathCurrentSystem, Linkname: app.CurrentSystem.String()}}, + {FilesystemConfig: &hst.FSLink{Target: pathBin, Linkname: pathSwBin.String()}}, + {FilesystemConfig: &hst.FSLink{Target: container.AbsFHSUsrBin, Linkname: pathSwBin.String()}}, {FilesystemConfig: &hst.FSBind{Source: workDir, Target: hst.AbsTmp.Append("bundle")}}, }, - Link: []hst.LinkConfig{ - {pathCurrentSystem, app.CurrentSystem.String()}, - {pathBin, pathSwBin.String()}, - {container.AbsFHSUsrBin, pathSwBin.String()}, - }, }, }, dropShell, beforeFail) } |