From ea1e3ebae993a3d89302940dc1649b627c420aa1 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 23 Aug 2025 00:16:46 +0900 Subject: container/params: pass fd instead of file The file is very difficult to stub. Pass fd instead as it is the value that is actually useful. Signed-off-by: Ophestra --- container/init.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'container/init.go') diff --git a/container/init.go b/container/init.go index 2139ccc3..813b4ac5 100644 --- a/container/init.go +++ b/container/init.go @@ -99,10 +99,10 @@ func initEntrypoint(k syscallDispatcher, prepareLogger func(prefix string), setV var ( params initParams closeSetup func() error - setupFile *os.File + setupFd uintptr offsetSetup int ) - if f, err := k.receive(setupEnv, ¶ms, &setupFile); err != nil { + if f, err := k.receive(setupEnv, ¶ms, &setupFd); err != nil { if errors.Is(err, EBADF) { k.fatal("invalid setup descriptor") } @@ -122,7 +122,7 @@ func initEntrypoint(k syscallDispatcher, prepareLogger func(prefix string), setV setVerbose(params.Verbose) k.verbose("received setup parameters") closeSetup = f - offsetSetup = int(setupFile.Fd() + 1) + offsetSetup = int(setupFd + 1) } // write uid/gid map here so parent does not need to set dumpable -- cgit v1.3.1