Blob Blame Raw
From 26ec8a9783cc5503a3a8928fa6eba5dd3e86ced1 Mon Sep 17 00:00:00 2001
From: Mrunal Patel <mrunalp@gmail.com>
Date: Tue, 14 Aug 2018 15:50:04 -0700
Subject: [PATCH] Revert "libcontainer/rootfs_linux: minor cleanup"

This reverts commit 1b27db67f13bccaaa325f8372069e15575988eb9.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
---
 libcontainer/rootfs_linux.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
index 7f852efce..cf715d664 100644
--- 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")