From owner-svn-src-head@freebsd.org  Tue Feb  6 20:12:06 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 930A7F020EE;
 Tue,  6 Feb 2018 20:12:06 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3E34E7E4CF;
 Tue,  6 Feb 2018 20:12:06 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 313E61CBC5;
 Tue,  6 Feb 2018 20:12:06 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w16KC62f074952;
 Tue, 6 Feb 2018 20:12:06 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w16KC64l074951;
 Tue, 6 Feb 2018 20:12:06 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201802062012.w16KC64l074951@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 6 Feb 2018 20:12:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r328949 - head/etc
X-SVN-Group: head
X-SVN-Commit-Author: feld
X-SVN-Commit-Paths: head/etc
X-SVN-Commit-Revision: 328949
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Feb 2018 20:12:06 -0000

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 ''