Always remount root rw if it's not

init.d/checkroot

@@ -30,6 +30,11 @@ do_mtab() {
 	rm -f /etc/mtab~ /etc/mtab~~
 }
 
+root_rw() {
+	echo 2>/dev/null >/.test.$$ || return 1
+	rm -f /.test.$$
+}
+
 do_fsck() {
 	local retval=0 opts=
 	case "${RC_UNAME}" in
@@ -42,9 +47,8 @@ do_fsck() {
 		return 0
 	fi
 
-	if echo 2>/dev/null >/.test.$$ ; then
+	if root_rw; then
 		einfo "root filesystem is mounted read-write - skipping"
-		rm -f /.test.$$
 		return 0
 	fi
 
@@ -106,6 +110,12 @@ do_fsck() {
 		fi
 	fi
 
+}
+
+start() {
+	do_fsck || return 1
+
+	if ! root_rw; then
 		ebegin "Remounting root filesystem read/write"
 		if [ "${RC_UNAME}" = "Linux" ] ; then
 			mount -n -o remount,rw /
@@ -113,10 +123,8 @@ do_fsck() {
 			mount -u -o rw /
 		fi
 		eend $? "Root filesystem could not be mounted read/write :("
-}
-
-start() {
-	do_fsck || return 1
+		return $?
+	fi
 
 	# Only Linux has mtab
 	[ "${RC_UNAME}" = "Linux" ] && do_mtab