From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R2nH5-0003QH-6r for garchives@archives.gentoo.org; Sun, 11 Sep 2011 16:52:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 193BE21C123; Sun, 11 Sep 2011 16:52:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DC25E21C123 for ; Sun, 11 Sep 2011 16:52:46 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BDF11B4009 for ; Sun, 11 Sep 2011 16:52:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 773B580042 for ; Sun, 11 Sep 2011 16:52:45 +0000 (UTC) From: "Christian Ruppert" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Ruppert" Message-ID: <2d180551ef5f2541e22a5eaf90b4efc7aadba914.idl0r@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/localmount.in init.d/mount-ro.in X-VCS-Directories: init.d/ X-VCS-Committer: idl0r X-VCS-Committer-Name: Christian Ruppert X-VCS-Revision: 2d180551ef5f2541e22a5eaf90b4efc7aadba914 Date: Sun, 11 Sep 2011 16:52:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 235a9d881aa9c456cdd89154b9da281b commit: 2d180551ef5f2541e22a5eaf90b4efc7aadba914 Author: Christian Ruppert gentoo org> AuthorDate: Sun Sep 11 13:12:54 2011 +0000 Commit: Christian Ruppert gentoo org> CommitDate: Sun Sep 11 16:51:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D2d180551 Fix regex pattern for umounts during shutdown This patch fixes the regex pattern for /lib -> /lib(32|64)? as well as the pattern for RC_SVCDIR if it contains /lib(32|64)?/. This fixes bug 381783. X-Gentoo-Bug: 381783 X-Gentoo-Bug-URL: https://bugs.gentoo.org/381783 --- init.d/localmount.in | 10 +++++++--- init.d/mount-ro.in | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/init.d/localmount.in b/init.d/localmount.in index 166ee77..3fbc071 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -34,8 +34,12 @@ start() stop() { # We never unmount / or /dev or $RC_SVCDIR - local x=3D no_umounts_r=3D"/|/dev|/dev/.*|${RC_SVCDIR}" - no_umounts_r=3D"${no_umounts_r}|/bin|/sbin|/lib|/libexec" + + # Bug 381783 + local rc_svcdir=3D$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|= 64)?/:g') + + local x=3D no_umounts_r=3D"/|/dev|/dev/.*|${rc_svcdir}" + no_umounts_r=3D"${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec" # RC_NO_UMOUNTS is an env var that can be set by plugins local IFS=3D"$IFS:" for x in $no_umounts $RC_NO_UMOUNTS; do @@ -69,7 +73,7 @@ stop() done [ -n "$fs" ] && fs=3D"^($fs)$" do_unmount umount --skip-point-regex "$no_umounts_r" \ - ${fs:+--skip-fstype-regex} $fs --nonetdev + "${fs:+--skip-fstype-regex}" $fs --nonetdev eoutdent =20 return 0 diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index 7049d4b..79b2e02 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -19,8 +19,12 @@ start() # We need the do_unmount function . "$RC_LIBEXECDIR"/sh/rc-mount.sh eindent - local m=3D"/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x=3D f= s=3D - m=3D"$m|/bin|/sbin|/lib|/libexec" + + # Bug 381783 + local rc_svcdir=3D$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|= 64)?/:g') + + local m=3D"/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${rc_svcdir}" x=3D f= s=3D + m=3D"$m|/bin|/sbin|/lib(32|64)?|/libexec" # RC_NO_UMOUNTS is an env var that can be set by plugins local IFS=3D"$IFS:" for x in $no_umounts $RC_NO_UMOUNTS; do @@ -34,7 +38,7 @@ start() [ -n "$fs" ] && fs=3D"^($fs)$" do_unmount "umount -r" \ --skip-point-regex "$m" \ - ${fs:+--skip-fstype-regex} $fs --nonetdev + "${fs:+--skip-fstype-regex}" $fs --nonetdev eoutdent eend $? }