From 0a7b0619d077d533a9dda4477fdeb37b06abddc6 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 18 Feb 2014 11:51:19 +0100
Subject: [PATCH] meta-digi-dey: sync local checkroot.sh script with upstream's

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../initscripts/initscripts-1.0/checkroot.sh         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/checkroot.sh
index 5202835d5..5a93e05aa 100755
--- a/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/checkroot.sh
@@ -22,7 +22,7 @@ test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
 exec 9< /etc/fstab
 rootmode=rw
 rootopts=rw
-rootcheck=no
+rootcheck=$ENABLE_ROOTFS_FSCK
 swap_on_md=no
 devfs=
 while read fs mnt type opts dump pass junk <&9
@@ -54,6 +54,16 @@ do
 done
 exec 0>&9 9>&-
 
+# Check for conflicting configurations
+if [ "$rootmode" = "ro" -a "$ROOTFS_READ_ONLY" = "no" ] || \
+	[ "$rootmode" = "rw" -a "$ROOTFS_READ_ONLY" = "yes" ]; then
+	echo ""
+	echo "WARN: conflicting configurations in /etc/fstab and /etc/default/rcS"
+	echo "      regarding the writability of rootfs. Please fix one of them."
+	echo ""
+fi
+
+
 #
 # Activate the swap device(s) in /etc/fstab. This needs to be done
 # before fsck, since fsck can be quite memory-hungry.