Index: init.d/checkroot
===================================================================
--- init.d/checkroot	(revision 3062)
+++ init.d/checkroot	(working copy)
@@ -14,19 +14,14 @@
 	ebegin "Updating /etc/mtab"
 
 	# Add the entry for / to mtab
-	mount -f /
+	if fstabinfo --quiet /; then
+		mount -f /
+		# Don't list root more than once
+		grep -v "^[^ ]* / " /proc/mounts >> /etc/mtab
+	else
+		cat /proc/mounts > /etc/mtab
+	fi
 
-	# Don't list root more than once
-	grep -v "^[^ ]* / " /proc/mounts >> /etc/mtab
-
-	# Now make sure /etc/mtab have additional info (gid, etc) in there
-	local mnt=
-	mountinfo | while read mnt; do
-		if fstabinfo --quiet "${mnt}"; then
-			mount -f -o remount "${mnt}"
-		fi
-	done
-
 	# Remove stale backups
 	rm -f /etc/mtab~ /etc/mtab~~
 	eend 0