From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3C3E1395E1 for ; Thu, 3 Nov 2016 17:36:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8057E0B5F; Thu, 3 Nov 2016 17:36:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76BCEE0B5F for ; Thu, 3 Nov 2016 17:36:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 753823414D6 for ; Thu, 3 Nov 2016 17:36:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACA29344 for ; Thu, 3 Nov 2016 17:36:42 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1478194161.bf539f2196290864ce5c5fd0d679b74ee016e2da.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/mount-ro.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: bf539f2196290864ce5c5fd0d679b74ee016e2da X-VCS-Branch: master Date: Thu, 3 Nov 2016 17:36:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8eedff40-5138-4c42-b877-e51fcf02d36b X-Archives-Hash: 44d3b289670ab9fb2cf738e15c0751c9 commit: bf539f2196290864ce5c5fd0d679b74ee016e2da Author: William Hubbs gmail com> AuthorDate: Thu Nov 3 17:29:21 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Nov 3 17:29:21 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=bf539f21 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 589f1a2..3553b7a 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