From f0b348bca688fff973d5bb124fcbfbfacd894dd2 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 11 Nov 2019 07:28:24 +0100
Subject: [PATCH] rc: since 11.2 fsck_ffs will actually return ERERUN error

---
 src/etc/rc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 1696eb350..eb7651994 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2018 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2019 Franco Fichtner <franco@opnsense.org>
 # Copyright (c) 2004-2010 Scott Ullrich <sullrich@gmail.com>
 # Copyright (c) 2003-2004 Manuel Kasper <mk@neon1.net>
 # All rights reserved.
@@ -99,8 +99,9 @@ done < /etc/fstab
 attempts=0
 while [ ${attempts} -lt 3 ]; do
 	if [ -n "${ROOT_IS_UFS}" ]; then
-		fsck -C -y /
-		fsck -C -y /
+		# fsck_ffs is required to be run twice
+		# in order to mark the system "clean"
+		fsck -C -y / || fsck -C -y /
 	fi
 	if mount -a; then
 		# bail if all is well