From c1399f5030abde76728ba7982a7a22fd49e75359 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 5 Nov 2025 02:47:43 +0900 Subject: std: rename from comp Seccomp lookup tables are going to be relocated here, and PNR constants. Signed-off-by: Ophestra --- hst/fsbind.go | 10 +++++----- hst/fsbind_test.go | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'hst') diff --git a/hst/fsbind.go b/hst/fsbind.go index 70e8bdc1..282f9a32 100644 --- a/hst/fsbind.go +++ b/hst/fsbind.go @@ -5,8 +5,8 @@ import ( "strings" "hakurei.app/container/check" - "hakurei.app/container/comp" "hakurei.app/container/fhs" + "hakurei.app/container/std" ) func init() { gob.Register(new(FSBind)) } @@ -97,16 +97,16 @@ func (b *FSBind) Apply(z *ApplyState) { } var flags int if b.Write { - flags |= comp.BindWritable + flags |= std.BindWritable } if b.Device { - flags |= comp.BindDevice | comp.BindWritable + flags |= std.BindDevice | std.BindWritable } if b.Ensure { - flags |= comp.BindEnsure + flags |= std.BindEnsure } if b.Optional { - flags |= comp.BindOptional + flags |= std.BindOptional } switch { diff --git a/hst/fsbind_test.go b/hst/fsbind_test.go index 037d07bb..61fc1f2c 100644 --- a/hst/fsbind_test.go +++ b/hst/fsbind_test.go @@ -4,7 +4,7 @@ import ( "testing" "hakurei.app/container" - "hakurei.app/container/comp" + "hakurei.app/container/std" "hakurei.app/hst" ) @@ -24,7 +24,7 @@ func TestFSBind(t *testing.T) { }, true, container.Ops{&container.BindMountOp{ Source: m("/mnt/dev"), Target: m("/dev"), - Flags: comp.BindWritable | comp.BindDevice | comp.BindOptional, + Flags: std.BindWritable | std.BindDevice | std.BindOptional, }}, m("/dev"), ms("/mnt/dev"), "d+/mnt/dev:/dev"}, @@ -36,7 +36,7 @@ func TestFSBind(t *testing.T) { }, true, container.Ops{&container.BindMountOp{ Source: m("/mnt/dev"), Target: m("/dev"), - Flags: comp.BindWritable | comp.BindDevice | comp.BindEnsure, + Flags: std.BindWritable | std.BindDevice | std.BindEnsure, }}, m("/dev"), ms("/mnt/dev"), "d-/mnt/dev:/dev"}, @@ -48,7 +48,7 @@ func TestFSBind(t *testing.T) { }, true, container.Ops{&container.BindMountOp{ Source: m("/mnt/dev"), Target: m("/dev"), - Flags: comp.BindWritable | comp.BindDevice, + Flags: std.BindWritable | std.BindDevice, }}, m("/dev"), ms("/mnt/dev"), "d*/mnt/dev:/dev"}, @@ -59,7 +59,7 @@ func TestFSBind(t *testing.T) { }, true, container.Ops{&container.BindMountOp{ Source: m("/mnt/tmp"), Target: m("/tmp"), - Flags: comp.BindWritable, + Flags: std.BindWritable, }}, m("/tmp"), ms("/mnt/tmp"), "w*/mnt/tmp:/tmp"}, @@ -98,7 +98,7 @@ func TestFSBind(t *testing.T) { Special: true, }, true, container.Ops{&container.AutoRootOp{ Host: m("/"), - Flags: comp.BindWritable, + Flags: std.BindWritable, }}, m("/"), ms("/"), "autoroot:w"}, {"autoroot silly", &hst.FSBind{ @@ -108,7 +108,7 @@ func TestFSBind(t *testing.T) { Special: true, }, true, container.Ops{&container.AutoRootOp{ Host: m("/etc"), - Flags: comp.BindWritable, + Flags: std.BindWritable, }}, m("/"), ms("/etc"), "autoroot:w:/etc"}, {"autoetc", &hst.FSBind{ -- cgit v1.3.1