1 files changed, 10 insertions, 9 deletions
diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
index 1de3a2e58..b947f5446 100644
--- a/sys-utils/switch_root.c
+++ b/sys-utils/switch_root.c
@@ -135,15 +135,6 @@ static int switchroot(const char *newroot)
 	}
 
 	cfd = open("/", O_RDONLY);
-	if (cfd >= 0) {
-		pid = fork();
-		if (pid <= 0) {
-			recursiveRemove(cfd);
-			if (pid == 0)
-				exit(EXIT_SUCCESS);
-		}
-		close(cfd);
-	}
 
 	if (mount(newroot, "/", NULL, MS_MOVE, NULL) < 0) {
 		warn("failed to mount moving %s to /", newroot);
@@ -154,6 +145,16 @@ static int switchroot(const char *newroot)
 		warn("failed to change root");
 		return -1;
 	}
+
+	if (cfd >= 0) {
+		pid = fork();
+		if (pid <= 0) {
+			recursiveRemove(cfd);
+			if (pid == 0)
+				exit(EXIT_SUCCESS);
+		}
+		close(cfd);
+	}
 	return 0;
 }