merge branch 'pr-1867'

cyphar · cyphar · commit 20aff4f0488c · 2018-08-15T15:42:56.000+10:00
Revert "libcontainer/rootfs_linux: minor cleanup" LGTMs: @hqhq @cyphar Closes opencontainers#1867
diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
@@ -46,6 +46,7 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) {
 		return newSystemErrorWithCause(err, "preparing rootfs")
 	}
 
+	setupDev := needsSetupDev(config)
 	for _, m := range config.Mounts {
 		for _, precmd := range m.PremountCmds {
 			if err := mountCmd(precmd); err != nil {
@@ -64,8 +65,6 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) {
 		}
 	}
 
-	setupDev := needsSetupDev(config)
-
 	if setupDev {
 		if err := createDevices(config); err != nil {
 			return newSystemErrorWithCause(err, "creating device nodes")

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) {`
`46`	`46`	`return newSystemErrorWithCause(err, "preparing rootfs")`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ setupDev := needsSetupDev(config)`
`49`	`50`	`for _, m := range config.Mounts {`
`50`	`51`	`for _, precmd := range m.PremountCmds {`
`51`	`52`	`if err := mountCmd(precmd); err != nil {`
`@@ -64,8 +65,6 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) {`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
`67`		`- setupDev := needsSetupDev(config)`
`68`		`-`
`69`	`68`	`if setupDev {`
`70`	`69`	`if err := createDevices(config); err != nil {`
`71`	`70`	`return newSystemErrorWithCause(err, "creating device nodes")`