From b852402f67b22a3a850ce4eb1305a3ce5898d128 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 17 Mar 2026 15:48:40 +0900 Subject: ext: move syscall wrappers from container These are generally useful, and none of them are container-specific. Syscalls subtle to use and requiring container-specific setup remains in container. Signed-off-by: Ophestra --- container/init.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'container/init.go') diff --git a/container/init.go b/container/init.go index 8fbf757e..3e2ec809 100644 --- a/container/init.go +++ b/container/init.go @@ -17,6 +17,7 @@ import ( "hakurei.app/container/fhs" "hakurei.app/container/seccomp" + "hakurei.app/ext" "hakurei.app/message" ) @@ -178,7 +179,7 @@ func initEntrypoint(k syscallDispatcher, msg message.Msg) { } // write uid/gid map here so parent does not need to set dumpable - if err := k.setDumpable(SUID_DUMP_USER); err != nil { + if err := k.setDumpable(ext.SUID_DUMP_USER); err != nil { k.fatalf(msg, "cannot set SUID_DUMP_USER: %v", err) } if err := k.writeFile(fhs.Proc+"self/uid_map", @@ -196,7 +197,7 @@ func initEntrypoint(k syscallDispatcher, msg message.Msg) { 0); err != nil { k.fatalf(msg, "%v", err) } - if err := k.setDumpable(SUID_DUMP_DISABLE); err != nil { + if err := k.setDumpable(ext.SUID_DUMP_DISABLE); err != nil { k.fatalf(msg, "cannot set SUID_DUMP_DISABLE: %v", err) } @@ -290,7 +291,7 @@ func initEntrypoint(k syscallDispatcher, msg message.Msg) { { var fd int - if err := IgnoringEINTR(func() (err error) { + if err := ext.IgnoringEINTR(func() (err error) { fd, err = k.open(fhs.Root, O_DIRECTORY|O_RDONLY, 0) return }); err != nil { -- cgit v1.3.1