diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-08-18 16:47:23 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-08-18 16:48:01 +0900 |
| commit | a3988c1a7725eb791795643e0810f03bab4572b3 (patch) | |
| tree | 53284c7405b077a2f09c2b5b08117f85a21554d9 /internal | |
| parent | 5db07140726e6e1bf615ed075e9a8b653508c2a7 (diff) | |
hst: rename net and abstract fields
This makes more sense and matches the container library.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/app/app_nixos_linux_test.go | 2 | ||||
| -rw-r--r-- | internal/app/container_linux.go | 4 | ||||
| -rw-r--r-- | internal/app/seal_linux.go | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/internal/app/app_nixos_linux_test.go b/internal/app/app_nixos_linux_test.go index 16ac2a23..2bf8f677 100644 --- a/internal/app/app_nixos_linux_test.go +++ b/internal/app/app_nixos_linux_test.go @@ -27,7 +27,7 @@ var testCasesNixos = []sealTestCase{ Shell: m("/run/current-system/sw/bin/zsh"), Container: &hst.ContainerConfig{ - Userns: true, Net: true, MapRealUID: true, Env: nil, AutoEtc: true, + Userns: true, HostNet: true, MapRealUID: true, Env: nil, AutoEtc: true, Filesystem: []hst.FilesystemConfigJSON{ f(&hst.FSBind{Source: m("/bin")}), f(&hst.FSBind{Source: m("/usr/bin/")}), diff --git a/internal/app/container_linux.go b/internal/app/container_linux.go index 7f088192..2d0a2365 100644 --- a/internal/app/container_linux.go +++ b/internal/app/container_linux.go @@ -32,8 +32,8 @@ func newContainer(s *hst.ContainerConfig, os sys.State, prefix string, uid, gid SeccompFlags: s.SeccompFlags, SeccompPresets: s.SeccompPresets, RetainSession: s.Tty, - HostNet: s.Net, - HostAbstract: s.Abstract, + HostNet: s.HostNet, + HostAbstract: s.HostAbstract, // the container is canceled when shim is requested to exit or receives an interrupt or termination signal; // this behaviour is implemented in the shim diff --git a/internal/app/seal_linux.go b/internal/app/seal_linux.go index 0ae121fb..23d65f95 100644 --- a/internal/app/seal_linux.go +++ b/internal/app/seal_linux.go @@ -238,11 +238,11 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co } conf := &hst.ContainerConfig{ - Userns: true, - Net: true, - Abstract: true, - Tty: true, - AutoEtc: true, + Userns: true, + HostNet: true, + HostAbstract: true, + Tty: true, + AutoEtc: true, AutoRoot: container.AbsFHSRoot, RootFlags: container.BindWritable, |