From 09d284498109b847da0da1e2c5f883268a7f2d46 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 21 Aug 2025 21:59:07 +0900 Subject: container/init: wrap syscall helper functions This allows tests to stub all kernel behaviour, enabling measurement of all function call arguments and error injection. Signed-off-by: Ophestra --- container/initproc.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'container/initproc.go') diff --git a/container/initproc.go b/container/initproc.go index 9b9769cd..fe02aeb7 100644 --- a/container/initproc.go +++ b/container/initproc.go @@ -3,7 +3,6 @@ package container import ( "encoding/gob" "fmt" - "os" . "syscall" ) @@ -18,14 +17,14 @@ func (f *Ops) Proc(target *Absolute) *Ops { // MountProcOp mounts a new instance of [FstypeProc] on container path Target. type MountProcOp struct{ Target *Absolute } -func (p *MountProcOp) Valid() bool { return p != nil && p.Target != nil } -func (p *MountProcOp) early(*setupState) error { return nil } -func (p *MountProcOp) apply(state *setupState) error { +func (p *MountProcOp) Valid() bool { return p != nil && p.Target != nil } +func (p *MountProcOp) early(*setupState, syscallDispatcher) error { return nil } +func (p *MountProcOp) apply(state *setupState, k syscallDispatcher) error { target := toSysroot(p.Target.String()) - if err := os.MkdirAll(target, state.ParentPerm); err != nil { + if err := k.mkdirAll(target, state.ParentPerm); err != nil { return wrapErrSelf(err) } - return wrapErrSuffix(Mount(SourceProc, target, FstypeProc, MS_NOSUID|MS_NOEXEC|MS_NODEV, zeroString), + return wrapErrSuffix(k.mount(SourceProc, target, FstypeProc, MS_NOSUID|MS_NOEXEC|MS_NODEV, zeroString), fmt.Sprintf("cannot mount proc on %q:", p.Target.String())) } -- cgit v1.3.1