From bf539f2196290864ce5c5fd0d679b74ee016e2da Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Thu, 3 Nov 2016 12:29:21 -0500
Subject: [PATCH] init.d/mount-ro: do not remount /usr read only if it is
 premounted

X-Gentoo-Bug: 573760
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573760
---
 init.d/mount-ro.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 589f1a2c..3553b7a3 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -34,6 +34,9 @@ start()
 
 	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs=
 	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
+	if [ -e "$rc_svcdir"/usr_premounted ]; then
+		m="$m|/usr"
+	fi
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do