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 1Qeuc7-0005ly-Mj for garchives@archives.gentoo.org; Thu, 07 Jul 2011 19:51:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9283B21C037; Thu, 7 Jul 2011 19:51:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 647AA21C037 for ; Thu, 7 Jul 2011 19:51:47 +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 BED491B4045 for ; Thu, 7 Jul 2011 19:51:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2312B8003D for ; Thu, 7 Jul 2011 19:51:46 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <0c7032840b746bc5f1e5f6cb90ad50b5da0a4fce.WilliamH@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: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 0c7032840b746bc5f1e5f6cb90ad50b5da0a4fce Date: Thu, 7 Jul 2011 19:51:46 +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: c75dd0a1ac287da5be8eee8f4888db7b commit: 0c7032840b746bc5f1e5f6cb90ad50b5da0a4fce Author: Kirill Elagin gmail com> AuthorDate: Thu Jul 7 16:51:39 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jul 7 17:23:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D0c703284 save and restore IFS correctly X-Gentoo-Bug: 371141 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=3D371141 --- init.d/localmount.in | 8 +------- init.d/mount-ro.in | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/init.d/localmount.in b/init.d/localmount.in index efbddc7..166ee77 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -37,16 +37,10 @@ stop() local x=3D no_umounts_r=3D"/|/dev|/dev/.*|${RC_SVCDIR}" no_umounts_r=3D"${no_umounts_r}|/bin|/sbin|/lib|/libexec" # RC_NO_UMOUNTS is an env var that can be set by plugins - local OIFS=3D$IFS SIFS=3D${IFS-y} - IFS=3D$IFS: + local IFS=3D"$IFS:" for x in $no_umounts $RC_NO_UMOUNTS; do no_umounts_r=3D"$no_umounts_r|$x" done - if [ "$SIFS" =3D y ]; then - IFS=3D$OIFS - else - unset IFS - fi =20 if [ "$RC_UNAME" =3D Linux ]; then no_umounts_r=3D"$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*" diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index dc2a098..7049d4b 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -22,16 +22,10 @@ start() local m=3D"/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x=3D f= s=3D m=3D"$m|/bin|/sbin|/lib|/libexec" # RC_NO_UMOUNTS is an env var that can be set by plugins - local OIFS=3D$IFS SIFS=3D${IFS-y} IFS=3D$IFS - IFS=3D$IFS: + local IFS=3D"$IFS:" for x in $no_umounts $RC_NO_UMOUNTS; do m=3D"$m|$x" done - if [ "$SIFS" =3D y ]; then - IFS=3D$OIFS - else - unset IFS - fi m=3D"^($m)$" fs=3D for x in $net_fs_list $extra_net_fs_list; do