diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-01-29 04:41:34 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-01-29 20:46:03 +0100 |
| commit | 658de1f60d5e4cd1d7c4b70843234820402f4352 (patch) | |
| tree | a478fba55a45164a4a8ee8a507c929cb93623712 | |
| parent | 82f98ecd4291e8d398a135ac5133c6e363c951dd (diff) | |
| download | mkinitcpio-658de1f60d5e4cd1d7c4b70843234820402f4352.tar.gz mkinitcpio-658de1f60d5e4cd1d7c4b70843234820402f4352.tar.xz | |
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>
| -rw-r--r-- | init | 2 | ||||
| -rw-r--r-- | init_functions | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -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 } |