From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 17E691381F3 for ; Mon, 17 Dec 2012 02:06:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E62621C002; Mon, 17 Dec 2012 02:06:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0975721C002 for ; Mon, 17 Dec 2012 02:06:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 153C533DC81 for ; Mon, 17 Dec 2012 02:06:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 72292E543C for ; Mon, 17 Dec 2012 02:06:40 +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: <1355709601.8d61d03e277c97cea5e449212baf5a6609ddef2c.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/localmount.in X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8d61d03e277c97cea5e449212baf5a6609ddef2c X-VCS-Branch: master Date: Mon, 17 Dec 2012 02:06:40 +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: 0bd71740-a680-475b-8f1e-1bd1c1a3abdf X-Archives-Hash: 1867da311c4a237a34faba0d892c6640 commit: 8d61d03e277c97cea5e449212baf5a6609ddef2c Author: Steve L rathaus eclipse co uk> AuthorDate: Mon Dec 17 02:00:01 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Dec 17 02:00:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8d61d03e localmount: quoting fixes X-Gentoo-Bug: 446556 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=446556 --- init.d/localmount.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/init.d/localmount.in b/init.d/localmount.in index 232adf4..7d6c305 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -23,7 +23,7 @@ start() if [ "$RC_UNAME" = Linux ]; then no_netdev="-O no_netdev" if mountinfo -q /usr; then - touch $RC_SVCDIR/usr_premounted + touch "$RC_SVCDIR"/usr_premounted fi fi ebegin "Mounting local filesystems" @@ -40,7 +40,7 @@ stop() # We never unmount / or /dev or $RC_SVCDIR # Bug 381783 - local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g') + local rc_svcdir=$(printf '%s\n' "$RC_SVCDIR" | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g') local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}" no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec" @@ -52,7 +52,7 @@ stop() if [ "$RC_UNAME" = Linux ]; then no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*" - if [ -e $rc_svcdir/usr_premounted ]; then + if [ -e "$rc_svcdir"/usr_premounted ]; then no_umounts_r="$no_umounts_r|/usr" fi fi