svn commit: r328949 - head/etc

[Mark Felder]

Author: feld (ports committer)
Date: Tue Feb  6 20:12:05 2018
New Revision: 328949
URL: https://svnweb.freebsd.org/changeset/base/328949

Log:
  Fix firstboot fs mount logic
  
  The firstboot logic has an error which causes the filesystem to be
  mounted readonly even though root_rw_mount=YES. This fixes the error to
  ensure that the root filesystem is mounted rw as expected after the run
  of the firstboot scripts.
  
  Reviewed by:	imp
  MFC after:	3 days
  Differential Revision:	https://reviews.freebsd.org/D14226

Modified:
  head/etc/rc

Modified: head/etc/rc
==============================================================================
--- head/etc/rc	Tue Feb  6 19:17:40 2018	(r328948)
+++ head/etc/rc	Tue Feb  6 20:12:05 2018	(r328949)
@@ -141,10 +141,10 @@ if [ -e ${firstboot_sentinel} ]; then
 	if [ -e ${firstboot_sentinel}-reboot ]; then
 		chflags -R 0 ${firstboot_sentinel}-reboot
 		rm -rf ${firstboot_sentinel}-reboot
-    		checkyesno root_rw_mount && mount -ur /
+    		checkyesno root_rw_mount || mount -ur /
 		kill -INT 1
 	fi
-    	checkyesno root_rw_mount && mount -ur /
+    	checkyesno root_rw_mount || mount -ur /
 fi
 
 echo ''