From 8d61d03e277c97cea5e449212baf5a6609ddef2c Mon Sep 17 00:00:00 2001
From: Steve L <slong@rathaus.eclipse.co.uk>
Date: Sun, 16 Dec 2012 20:00:01 -0600
Subject: 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 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'init.d/localmount.in')

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 232adf49..7d6c3050 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
-- 
cgit v1.2.3