From 7434a449dcae6f3d2a1473552073745121fc85ea Mon Sep 17 00:00:00 2001
From: Thomas Bächler <thomas@archlinux.org>
Date: Fri, 8 Apr 2011 17:45:14 +0200
Subject: init: Unify/improve mount --move handling

- Loop over dev, sys, proc instead of repeating the same command.
- If the target directory does not exist, umount instead of moving.
---
 init | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'init')

diff --git a/init b/init
index f242dc1..d030f5f 100644
--- a/init
+++ b/init
@@ -151,7 +151,11 @@ if [ -n "${udevpid}" ]; then
     done
 fi
 
-mount --move /proc /new_root/proc
-mount --move /sys /new_root/sys
-mount --move /dev /new_root/dev
+for d in proc sys dev; do
+    if [ -d /new_root/${d} ]; then
+        /bin/mount --move /${d} /new_root/${d}
+    else
+        /bin/umount /${d}
+    fi
+done
 exec /sbin/switch_root -c /dev/console /new_root ${init} "$@"
-- 
cgit v1.2.3-24-g4f1b