From d9e8e8b4ec955574027619b4cd7ba728d360bf86 Mon Sep 17 00:00:00 2001
From: Daniel Dickinson <crazycshore@gmail.com>
Date: Wed, 30 Jun 2010 23:09:13 +0000
Subject: block-extroot, block-mount: Fixed multiple bugs which prevented
 e2fsck from being executed on the external root filesystem before mounting it
 as root. Added /etc/e2fsck.conf which indicates that the clock is broken
 (since most OpenWRT devices don't have a battery backed RTC) so that e2fsck
 will not exit with fatal error when the rdat has not yet been run (i.e.
 before network).

SVN-Revision: 22002
---
 package/block-mount/files/fsck.sh | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'package/block-mount/files/fsck.sh')

diff --git a/package/block-mount/files/fsck.sh b/package/block-mount/files/fsck.sh
index d80e71693e..2b64025635 100644
--- a/package/block-mount/files/fsck.sh
+++ b/package/block-mount/files/fsck.sh
@@ -12,20 +12,18 @@ libmount_fsck() {
 	local found_fsck=0
 	
 
-	[ -n "$fsck_type" ] && [ "$fsck_type" != "swap" ] && {
-		grep -q "$device" /proc/swaps || grep -q "$device" /proc/mounts || {
-			[ -e "$device" ] && [ "$fsck_enabled" -eq 1 ] && {
-				for known_type in $libmount_known_fsck; do
-					if [ "$known_type" = "$fsck_fstype" ]; then
-						fsck_${known_type} "$device"
-						found_fsck=1
-						break
-					fi
-				done
-				if [ "$found_fsck" -ne 1 ]; then
-					logger -t 'fstab' "Unable to check/repair $device; no known fsck for filesystem type $fstype"
+	grep -q "$device" /proc/swaps || grep -q "$device" /proc/mounts || {
+		[ -e "$device" ] && [ "$fsck_enabled" -eq 1 ] && {
+			for known_type in $libmount_known_fsck; do
+				if [ "$known_type" = "$fsck_fstype" ]; then
+					fsck_${known_type} "$device"
+					found_fsck=1
+					break
 				fi
-			}
+			done
+			if [ "$found_fsck" -ne 1 ]; then
+				logger -t 'fstab' "Unable to check/repair $device; no known fsck for filesystem type $fstype"
+			fi
 		}
 	}
 }
-- 
cgit v1.2.3