From 658de1f60d5e4cd1d7c4b70843234820402f4352 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 28 Jan 2012 22:41:34 -0500
Subject: init: use fastboot, not skip to avoid fsck

Move this logic inside fsck_device as well, so that fastboot skips a
possible fsck on the /usr partition as well.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 init           | 2 +-
 init_functions | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/init b/init
index 86a954b..b596a68 100644
--- a/init
+++ b/init
@@ -64,7 +64,7 @@ fi
 rootdev=$(resolve_device "$root") && root=$rootdev
 unset rootdev
 
-[ -z "$skipfsck" ] && fsck_root
+fsck_root
 
 # Mount root at /new_root
 ${mount_handler:-default_mount_handler} /new_root
diff --git a/init_functions b/init_functions
index 4945136..e9a0cb9 100644
--- a/init_functions
+++ b/init_functions
@@ -96,6 +96,11 @@ fsck_device() {
         return 255
     fi
 
+    if [ -n "$fastboot" ]; then
+        msg ":: skipping fsck on '$1'"
+        return
+    fi
+
     msg ":: performing fsck on '$1'"
     FSTAB_FILE=/dev/null fsck -Ta -C"$FSCK_FD" "$1" -- $FORCEFSCK
 }
-- 
cgit v1.2.3-24-g4f1b