diff options
Diffstat (limited to 'cmd/hpkg')
| -rw-r--r-- | cmd/hpkg/app.go | 8 | ||||
| -rw-r--r-- | cmd/hpkg/with.go | 17 |
2 files changed, 9 insertions, 16 deletions
diff --git a/cmd/hpkg/app.go b/cmd/hpkg/app.go index 5fd5e640..1a1437ff 100644 --- a/cmd/hpkg/app.go +++ b/cmd/hpkg/app.go @@ -6,7 +6,6 @@ import ( "os" "hakurei.app/container" - "hakurei.app/container/seccomp" "hakurei.app/hst" "hakurei.app/system/dbus" ) @@ -92,6 +91,7 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg Device: app.Device, Tty: app.Tty || flagDropShell, MapRealUID: app.MapRealUID, + Multiarch: app.Multiarch, 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}}, @@ -113,12 +113,6 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg {Ensure: true, Path: pathSet.baseDir, Read: true, Write: true, Execute: true}, }, } - if app.Multiarch { - config.Container.SeccompFlags |= seccomp.AllowMultiarch - } - if app.Bluetooth { - config.Container.SeccompFlags |= seccomp.AllowBluetooth - } return config } diff --git a/cmd/hpkg/with.go b/cmd/hpkg/with.go index 578d5251..59545c62 100644 --- a/cmd/hpkg/with.go +++ b/cmd/hpkg/with.go @@ -6,7 +6,6 @@ import ( "strings" "hakurei.app/container" - "hakurei.app/container/seccomp" "hakurei.app/hst" ) @@ -43,11 +42,11 @@ func withNixDaemon( Identity: app.Identity, Container: &hst.ContainerConfig{ - Hostname: formatHostname(app.Name) + "-" + action, - Userns: true, // nix sandbox requires userns - HostNet: net, - SeccompFlags: seccomp.AllowMultiarch, - Tty: dropShell, + Hostname: formatHostname(app.Name) + "-" + action, + Userns: true, // nix sandbox requires userns + HostNet: net, + Multiarch: true, + Tty: dropShell, 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}}, @@ -83,9 +82,9 @@ func withCacheDir( Identity: app.Identity, Container: &hst.ContainerConfig{ - Hostname: formatHostname(app.Name) + "-" + action, - SeccompFlags: seccomp.AllowMultiarch, - Tty: dropShell, + Hostname: formatHostname(app.Name) + "-" + action, + Multiarch: true, + Tty: dropShell, 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}}, |