From a3988c1a7725eb791795643e0810f03bab4572b3 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 18 Aug 2025 16:47:23 +0900 Subject: hst: rename net and abstract fields This makes more sense and matches the container library. Signed-off-by: Ophestra --- cmd/hakurei/print.go | 3 ++- cmd/hakurei/print_test.go | 13 ++++++++----- cmd/hpkg/app.go | 20 ++++++++++---------- cmd/hpkg/with.go | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) (limited to 'cmd') diff --git a/cmd/hakurei/print.go b/cmd/hakurei/print.go index 78c34bec..d163efc3 100644 --- a/cmd/hakurei/print.go +++ b/cmd/hakurei/print.go @@ -98,7 +98,8 @@ func printShowInstance( } writeFlag("userns", params.Userns) writeFlag("devel", params.Devel) - writeFlag("net", params.Net) + writeFlag("net", params.HostNet) + writeFlag("abstract", params.HostAbstract) writeFlag("device", params.Device) writeFlag("tty", params.Tty) writeFlag("mapuid", params.MapRealUID) diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index c2f97ec1..dab4b9ec 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -41,7 +41,7 @@ func Test_printShowInstance(t *testing.T) { Groups: video, dialout, plugdev Data: /var/lib/hakurei/u0/org.chromium.Chromium Hostname: localhost - Flags: userns devel net device tty mapuid autoetc + Flags: userns devel net abstract device tty mapuid autoetc Root: /var/lib/hakurei/base/org.debian (2) Etc: /etc/ Path: /run/current-system/sw/bin/chromium @@ -120,7 +120,7 @@ App Groups: video, dialout, plugdev Data: /var/lib/hakurei/u0/org.chromium.Chromium Hostname: localhost - Flags: userns devel net device tty mapuid autoetc + Flags: userns devel net abstract device tty mapuid autoetc Root: /var/lib/hakurei/base/org.debian (2) Etc: /etc/ Path: /run/current-system/sw/bin/chromium @@ -267,7 +267,8 @@ App "seccomp_compat": true, "devel": true, "userns": true, - "net": true, + "host_net": true, + "host_abstract": true, "tty": true, "multiarch": true, "env": { @@ -415,7 +416,8 @@ App "seccomp_compat": true, "devel": true, "userns": true, - "net": true, + "host_net": true, + "host_abstract": true, "tty": true, "multiarch": true, "env": { @@ -617,7 +619,8 @@ func Test_printPs(t *testing.T) { "seccomp_compat": true, "devel": true, "userns": true, - "net": true, + "host_net": true, + "host_abstract": true, "tty": true, "multiarch": true, "env": { diff --git a/cmd/hpkg/app.go b/cmd/hpkg/app.go index 713a4fc7..e35dbf98 100644 --- a/cmd/hpkg/app.go +++ b/cmd/hpkg/app.go @@ -26,9 +26,9 @@ type appInfo struct { // passed through to [hst.Config] Userns bool `json:"userns,omitempty"` // passed through to [hst.Config] - Net bool `json:"net,omitempty"` + HostNet bool `json:"net,omitempty"` // passed through to [hst.Config] - Abstract bool `json:"abstract,omitempty"` + HostAbstract bool `json:"abstract,omitempty"` // passed through to [hst.Config] Device bool `json:"dev,omitempty"` // passed through to [hst.Config] @@ -85,14 +85,14 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *container.Absolute, arg Groups: app.Groups, Container: &hst.ContainerConfig{ - Hostname: formatHostname(app.Name), - Devel: app.Devel, - Userns: app.Userns, - Net: app.Net, - Abstract: app.Abstract, - Device: app.Device, - Tty: app.Tty || flagDropShell, - MapRealUID: app.MapRealUID, + Hostname: formatHostname(app.Name), + Devel: app.Devel, + Userns: app.Userns, + HostNet: app.HostNet, + HostAbstract: app.HostAbstract, + Device: app.Device, + Tty: app.Tty || flagDropShell, + MapRealUID: app.MapRealUID, Filesystem: []hst.FilesystemConfigJSON{ {FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath.Append("store"), Target: pathNixStore}}, {FilesystemConfig: &hst.FSBind{Source: pathSet.metaPath, Target: hst.AbsTmp.Append("app")}}, diff --git a/cmd/hpkg/with.go b/cmd/hpkg/with.go index c6f3f22b..acb503d1 100644 --- a/cmd/hpkg/with.go +++ b/cmd/hpkg/with.go @@ -45,7 +45,7 @@ func withNixDaemon( Container: &hst.ContainerConfig{ Hostname: formatHostname(app.Name) + "-" + action, Userns: true, // nix sandbox requires userns - Net: net, + HostNet: net, SeccompFlags: seccomp.AllowMultiarch, Tty: dropShell, Filesystem: []hst.FilesystemConfigJSON{ -- cgit v1.3.1