From 44747953886eff57b246c3e6a01ec80fc6804476 Mon Sep 17 00:00:00 2001 From: Kenta Tada Date: Thu, 23 Apr 2020 10:45:40 +0900 Subject: [PATCH] libcontainer: use x/sys/unix instead of the hardcoded value PR_SET_CHILD_SUBREAPER is defined in x/sys/unix. Signed-off-by: Kenta Tada --- libcontainer/system/linux.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/libcontainer/system/linux.go b/libcontainer/system/linux.go index 7548969a..36d72a53 100644 --- a/libcontainer/system/linux.go +++ b/libcontainer/system/linux.go @@ -11,19 +11,6 @@ import ( "golang.org/x/sys/unix" ) -// If arg2 is nonzero, set the "child subreaper" attribute of the -// calling process; if arg2 is zero, unset the attribute. When a -// process is marked as a child subreaper, all of the children -// that it creates, and their descendants, will be marked as -// having a subreaper. In effect, a subreaper fulfills the role -// of init(1) for its descendant processes. Upon termination of -// a process that is orphaned (i.e., its immediate parent has -// already terminated) and marked as having a subreaper, the -// nearest still living ancestor subreaper will receive a SIGCHLD -// signal and be able to wait(2) on the process to discover its -// termination status. -const PR_SET_CHILD_SUBREAPER = 36 - type ParentDeathSignal int func (p ParentDeathSignal) Restore() error { @@ -139,7 +126,7 @@ func GetParentNSeuid() int64 { // SetSubreaper sets the value i as the subreaper setting for the calling process func SetSubreaper(i int) error { - return unix.Prctl(PR_SET_CHILD_SUBREAPER, uintptr(i), 0, 0, 0) + return unix.Prctl(unix.PR_SET_CHILD_SUBREAPER, uintptr(i), 0, 0, 0) } // GetSubreaper returns the subreaper setting for the calling process