github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-05 17:02:00 +00:00
Code Issues Projects Releases Wiki Activity

pkgs: Update packages to the latest linuxkit/alpine

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher
2021-04-21 08:18:39 +03:00
parent 07ca23f8fe
commit ef3e45ac02
43 changed files with 90 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/init/cmd/service/runc.go
View File

@@ -9,8 +9,8 @@ import (
"path/filepath"
"strconv"
"github.com/opencontainers/runc/libcontainer/system"
log "github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
const (
@@ -49,7 +49,7 @@ func runcInit(rootPath, serviceType string) int {
}
// need to set ourselves as a child subreaper or we cannot wait for runc as reparents to init
if err := system.SetSubreaper(1); err != nil {
if err := setSubreaper(1); err != nil {
log.Fatalf("Cannot set as subreaper: %v", err)
}
@@ -164,3 +164,9 @@ func runcInit(rootPath, serviceType string) int {
return status
}
// setSubreaper copied directly from https://github.com/opencontainers/runc/blob/b23315bdd99c388f5d0dd3616188729c5a97484a/libcontainer/system/linux.go#L88
// to avoid version and vendor conflict issues
func setSubreaper(i int) error {
return unix.Prctl(unix.PR_SET_CHILD_SUBREAPER, uintptr(i), 0, 0, 0)
}