zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-17 13:00:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into api

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	MAINTAINERS
	cgroups/cgroups.go
	cgroups/fs/apply_raw.go
	cgroups/fs/notify_linux.go
	cgroups/fs/notify_linux_test.go
	cgroups/systemd/apply_systemd.go
	config.go
	configs/config_test.go
	console/console.go
	integration/exec_test.go
	integration/init_test.go
	integration/template_test.go
	integration/utils_test.go
	linux_notify.go
	linux_notify_test.go
	mount/init.go
	mount/mount_config.go
	mount/pivotroot.go
	mount/ptmx.go
	namespaces/create.go
	namespaces/exec.go
	namespaces/execin.go
	namespaces/init.go
	namespaces/nsenter/nsenter.c
	namespaces/nsenter/nsenter.go
	namespaces/utils.go
	network/network.go
	network/types.go
	network/veth.go
	notify_linux.go
	notify_linux_test.go
	nsinit/exec.go
	nsinit/main.go
	nsinit/nsenter.go
	nsinit/oom.go
	sample_configs/host-pid.json
	sample_configs/userns.json
	security/capabilities/capabilities.go
	update-vendor.sh
This commit is contained in:
Michael Crosby
2015-02-16 13:09:00 -08:00
parent 55d61e22c5 3f35b26b8b
commit f4cf808a3d
71 changed files with 4724 additions and 3479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
linux_init.go
View File

@@ -9,13 +9,13 @@ import (
"strings"
"syscall"
log "github.com/Sirupsen/logrus"
"github.com/docker/libcontainer/cgroups"
"github.com/docker/libcontainer/configs"
"github.com/docker/libcontainer/netlink"
"github.com/docker/libcontainer/system"
"github.com/docker/libcontainer/user"
"github.com/docker/libcontainer/utils"
"github.com/golang/glog"
)
type initType string
@@ -235,7 +235,7 @@ func setupRlimits(config *configs.Config) error {
func killCgroupProcesses(m cgroups.Manager) error {
var procs []*os.Process
if err := m.Freeze(configs.Frozen); err != nil {
glog.Warning(err)
log.Warn(err)
}
pids, err := m.GetPids()
if err != nil {
@@ -246,16 +246,16 @@ func killCgroupProcesses(m cgroups.Manager) error {
if p, err := os.FindProcess(pid); err == nil {
procs = append(procs, p)
if err := p.Kill(); err != nil {
glog.Warning(err)
log.Warn(err)
}
}
}
if err := m.Freeze(configs.Thawed); err != nil {
glog.Warning(err)
log.Warn(err)
}
for _, p := range procs {
if _, err := p.Wait(); err != nil {
glog.Warning(err)
log.Warn(err)
}
}
return nil