[fix] execute prepareRootfs for a new mount namespace only

verm666 · verm666 · commit 4af4f407f5a5 · 2018-10-11T17:45:37.000+01:00
diff --git a/libcontainer/standard_init_linux.go b/libcontainer/standard_init_linux.go
@@ -78,8 +78,11 @@ func (l *linuxStandardInit) Init() error {
 	}
 
 	label.Init()
-	if err := prepareRootfs(l.pipe, l.config); err != nil {
-		return err
+	// prepareRootfs() can be executed only for a new mount namespace.
+	if l.config.Config.Namespaces.Contains(configs.NEWNS) {
+		if err := prepareRootfs(l.pipe, l.config); err != nil {
+			return err
+		}
 	}
 	// Set up the console. This has to be done *before* we finalize the rootfs,
 	// but *after* we've given the user the chance to set up all of the mounts

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,11 @@ func (l *linuxStandardInit) Init() error {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`label.Init()`
`81`		`- if err := prepareRootfs(l.pipe, l.config); err != nil {`
`82`		`- return err`
	`81`	`+ // prepareRootfs() can be executed only for a new mount namespace.`
	`82`	`+ if l.config.Config.Namespaces.Contains(configs.NEWNS) {`
	`83`	`+ if err := prepareRootfs(l.pipe, l.config); err != nil {`
	`84`	`+ return err`
	`85`	`+ }`
`83`	`86`	`}`
`84`	`87`	`// Set up the console. This has to be done before we finalize the rootfs,`
`85`	`88`	`// but after we've given the user the chance to set up all of the mounts`