Merge pull request #1840 from avagin/empty-ns-network

hqhq · web-flow · commit bc1467269fce · 2018-07-18T14:22:36.000+08:00
cr: don't dump network devices and their configuration
diff --git a/checkpoint.go b/checkpoint.go
@@ -125,7 +125,8 @@ var namespaceMapping = map[specs.LinuxNamespaceType]int{
 }
 
 func setEmptyNsMask(context *cli.Context, options *libcontainer.CriuOpts) error {
-	var nsmask int
+	/* Runc doesn't manage network devices and their configuration */
+	nsmask := unix.CLONE_NEWNET
 
 	for _, ns := range context.StringSlice("empty-ns") {
 		f, exists := namespaceMapping[specs.LinuxNamespaceType(ns)]

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@ var namespaceMapping = map[specs.LinuxNamespaceType]int{`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`func setEmptyNsMask(context cli.Context, options libcontainer.CriuOpts) error {`
`128`		`- var nsmask int`
	`128`	`+ /* Runc doesn't manage network devices and their configuration */`
	`129`	`+ nsmask := unix.CLONE_NEWNET`
`129`	`130`
`130`	`131`	`for _, ns := range context.StringSlice("empty-ns") {`
`131`	`132`	`f, exists := namespaceMapping[specs.LinuxNamespaceType(ns)]`