fix killall when use pidnamespace

tedyu · tedyu · commit 4105135e3680 · 2020-02-26T20:56:49.000-08:00
Signed-off-by: Ted Yu &lt;yuzhihong@gmail.com&gt;
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -634,7 +634,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {
 
 	if bundleSpec.Linux != nil {
 		for _, ns := range bundleSpec.Linux.Namespaces {
-			if ns.Type == specs.PIDNamespace {
+			if ns.Type == specs.PIDNamespace && ns.Path == "" {
 				return false, nil
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ func shouldKillAllOnExit(bundlePath string) (bool, error) {`
`634`	`634`
`635`	`635`	`if bundleSpec.Linux != nil {`
`636`	`636`	`for _, ns := range bundleSpec.Linux.Namespaces {`
`637`		`- if ns.Type == specs.PIDNamespace {`
	`637`	`+ if ns.Type == specs.PIDNamespace && ns.Path == "" {`
`638`	`638`	`return false, nil`
`639`	`639`	`}`
`640`	`640`	`}`