diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-04-13 03:23:28 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-04-13 03:30:19 +0900 |
| commit | 31b7ddd122d54c36edb101d2c8bdf230651f27d4 (patch) | |
| tree | 2dd0623bfa0d410d83aabfc51d276df3a14ef3e8 /cmd/fpkg/main.go | |
| parent | c460892cbdfa66a2cf1f0ebcec59cf550e67962e (diff) | |
fst: improve config
The config struct more or less "grew" to what it is today. This change moves things around to make more sense and fixes nonsensical comments describing obsolete behaviour.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd/fpkg/main.go')
| -rw-r--r-- | cmd/fpkg/main.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/fpkg/main.go b/cmd/fpkg/main.go index e48cfb57..ac95bc1f 100644 --- a/cmd/fpkg/main.go +++ b/cmd/fpkg/main.go @@ -157,11 +157,11 @@ func main() { return errSuccess } - // AppID determines uid - if a.AppID != bundle.AppID { + // identity determines uid + if a.Identity != bundle.Identity { cleanup() - log.Printf("package %q app id %d differs from installed %d", - pkgPath, bundle.AppID, a.AppID) + log.Printf("package %q identity %d differs from installed %d", + pkgPath, bundle.Identity, a.Identity) return syscall.EBADE } @@ -292,7 +292,7 @@ func main() { "--override-input nixpkgs path:/etc/nixpkgs " + "path:" + a.NixGL + "#nixVulkanNvidia", }, true, func(config *fst.Config) *fst.Config { - config.Confinement.Sandbox.Filesystem = append(config.Confinement.Sandbox.Filesystem, []*fst.FilesystemConfig{ + config.Container.Filesystem = append(config.Container.Filesystem, []*fst.FilesystemConfig{ {Src: "/etc/resolv.conf"}, {Src: "/sys/block"}, {Src: "/sys/bus"}, @@ -324,7 +324,7 @@ func main() { */ if a.GPU { - config.Confinement.Sandbox.Filesystem = append(config.Confinement.Sandbox.Filesystem, + config.Container.Filesystem = append(config.Container.Filesystem, &fst.FilesystemConfig{Src: path.Join(pathSet.nixPath, ".nixGL"), Dst: path.Join(fst.Tmp, "nixGL")}) appendGPUFilesystem(config) } |