From 99ac96511bed17f48d908db3d00a1f48579ba011 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 12 Aug 2025 04:38:45 +0900 Subject: hst/fs: interface filesystem config This allows mount points to be represented by different underlying structs. Signed-off-by: Ophestra --- cmd/hpkg/app.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cmd/hpkg/app.go') diff --git a/cmd/hpkg/app.go b/cmd/hpkg/app.go index 705b393b..131f839d 100644 --- a/cmd/hpkg/app.go +++ b/cmd/hpkg/app.go @@ -91,15 +91,15 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg Device: app.Device, Tty: app.Tty || flagDropShell, MapRealUID: app.MapRealUID, - Filesystem: []hst.FilesystemConfig{ - {Src: pathSet.nixPath.Append("store"), Dst: pathNixStore, Must: true}, - {Src: pathSet.metaPath, Dst: hst.AbsTmp.Append("app"), Must: true}, - {Src: container.AbsFHSEtc.Append("resolv.conf")}, - {Src: container.AbsFHSSys.Append("block")}, - {Src: container.AbsFHSSys.Append("bus")}, - {Src: container.AbsFHSSys.Append("class")}, - {Src: container.AbsFHSSys.Append("dev")}, - {Src: container.AbsFHSSys.Append("devices")}, + Filesystem: []hst.FilesystemConfigJSON{ + {FilesystemConfig: &hst.FSBind{Src: pathSet.nixPath.Append("store"), Dst: pathNixStore}}, + {FilesystemConfig: &hst.FSBind{Src: pathSet.metaPath, Dst: hst.AbsTmp.Append("app")}}, + {FilesystemConfig: &hst.FSBind{Src: container.AbsFHSEtc.Append("resolv.conf"), Optional: true}}, + {FilesystemConfig: &hst.FSBind{Src: container.AbsFHSSys.Append("block"), Optional: true}}, + {FilesystemConfig: &hst.FSBind{Src: container.AbsFHSSys.Append("bus"), Optional: true}}, + {FilesystemConfig: &hst.FSBind{Src: container.AbsFHSSys.Append("class"), Optional: true}}, + {FilesystemConfig: &hst.FSBind{Src: container.AbsFHSSys.Append("dev"), Optional: true}}, + {FilesystemConfig: &hst.FSBind{Src: container.AbsFHSSys.Append("devices"), Optional: true}}, }, Link: []hst.LinkConfig{ {pathCurrentSystem, app.CurrentSystem.String()}, -- cgit v1.3.1