Sometimes fsck requires a second run, teach rc script to call it more than once when it's necessary

1 files changed, 30 insertions, 5 deletions

diff --git a/etc/rc b/etc/rc
index e5a6589..01df7d2 100755
--- a/etc/rc
+++ b/etc/rc
@@ -72,9 +72,26 @@ else
 	# Mount /. If it fails run a fsck.
 	if [ "$PLATFORM" = "nanobsd" ]; then
 		export PKG_TMPDIR=/root/
-		/sbin/mount -uw / || (/sbin/fsck -y /; /sbin/fsck -y /cf; /sbin/mount -uw /)
-	else 
-		/sbin/mount -a || (/sbin/fsck -y /; /sbin/mount -a)
+		/sbin/mount -uw / 2>/dev/null
+		mount_rc=$?
+		attempts=0
+		while [ ${mount_rc} != 0 -a ${attempts} -lt 3 ]; do
+			/sbin/fsck -y /
+			/sbin/fsck -y /cf
+			/sbin/mount -uw / 2>/dev/null
+			mount_rc=$?
+			attempts=$((attempts+1))
+		done
+	else
+		/sbin/mount -a 2>/dev/null
+		mount_rc=$?
+		attempts=0
+		while [ ${mount_rc} != 0 -a ${attempts} -lt 3 ]; do
+			/sbin/fsck -y /
+			/sbin/mount -a 2>/dev/null
+			mount_rc=$?
+			attempts=$((attempts+1))
+		done
 	fi
 
 	# If /conf is a directory, convert it to a symlink to /cf/conf
@@ -92,8 +109,16 @@ else
 		# If it fails to mount then run a fsck -y
 		if grep -q cf /etc/fstab; then
 			/sbin/mount -w /cf 2>/dev/null
-			/sbin/mount -uw /cf || \
-				(/sbin/umount /cf; /sbin/fsck -y /cf; /sbin/mount -w /cf)
+			/sbin/mount -uw /cf 2>/dev/null
+			mount_rc=$?
+			attempts=0
+			while [ ${mount_rc} != 0 -a ${attempts} -lt 3 ]; do
+				/sbin/umount /cf
+				/sbin/fsck -y /cf
+				/sbin/mount -w /cf 2>/dev/null
+				mount_rc=$?
+				attempts=$((attempts+1))
+			done
 		fi
 	fi