From owner-svn-src-stable@freebsd.org  Mon May 22 16:07:18 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDC76D78FA7;
 Mon, 22 May 2017 16:07:18 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id BD1C21D0C;
 Mon, 22 May 2017 16:07:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4MG7Hoh084083;
 Mon, 22 May 2017 16:07:17 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4MG7HnY084082;
 Mon, 22 May 2017 16:07:17 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201705221607.v4MG7HnY084082@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 22 May 2017 16:07:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r318652 - stable/11/etc
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 May 2017 16:07:19 -0000

Author: gjb
Date: Mon May 22 16:07:17 2017
New Revision: 318652
URL: https://svnweb.freebsd.org/changeset/base/318652

Log:
  MFC r307469 (imp):
   Allow root_rw_mount to be both lower and upper case. Before, if it was
   upper case, you'd wind up with a read-only filesystem when you should
   sometimes.
  
  PR: 213549
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/etc/rc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/rc
==============================================================================
--- stable/11/etc/rc	Mon May 22 15:53:30 2017	(r318651)
+++ stable/11/etc/rc	Mon May 22 16:07:17 2017	(r318652)
@@ -135,16 +135,16 @@ done
 # Note: this assumes firstboot_sentinel is on / when we have
 # a read-only /, or that it is on media that's writable.
 if [ -e ${firstboot_sentinel} ]; then
-	[ ${root_rw_mount} = "yes" ] || mount -uw /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -uw /
 	chflags -R 0 ${firstboot_sentinel}
 	rm -rf ${firstboot_sentinel}
 	if [ -e ${firstboot_sentinel}-reboot ]; then
 		chflags -R 0 ${firstboot_sentinel}-reboot
 		rm -rf ${firstboot_sentinel}-reboot
-		[ ${root_rw_mount} = "yes" ] || mount -ur /
+		[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 		kill -INT 1
 	fi
-	[ ${root_rw_mount} = "yes" ] || mount -ur /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 fi
 
 echo ''