init: mount separate /usr

Use findmnt to detect the existance of a separate /usr partition
existing in the real root. If it does exist, fetch the options for it
and mount it. This currently makes a lot of assumptions and won't be
very friendly towards something such as a dm-crypt device.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>

1 files changed, 9 insertions, 0 deletions

diff --git a/init b/init
index 571a11a..8cf90b1 100644
--- a/init
+++ b/init
@@ -98,6 +98,15 @@ elif [ ! -x "/new_root${init}" ]; then
     launch_interactive_shell --exec
 fi
 
+# mount /usr if it exists
+if [ -f /new_root/etc/fstab ]; then
+    if usr_source=$(findmnt -nero source -s/new_root/etc/fstab /usr); then
+        mountopts=$(findmnt -nero options -s/new_root/etc/fstab /usr)
+        fsck_device "$usr_source"
+        mount "$usr_source" /new_root/usr -o "$mountopts"
+    fi
+fi
+
 if [ "${break}" = "postmount" ]; then
     echo ":: Post-mount break requested, type 'exit' to resume operation"
     launch_interactive_shell