emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

localmount: quoting fixes

Browse Source 
X-Gentoo-Bug: 446556
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=446556
This commit is contained in:
Steve L 2012-12-16 20:00:01 -06:00 committed by William Hubbs
parent 230a678824
commit 8d61d03e27
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init.d/localmount.in
View File

@ -23,7 +23,7 @@ start()
if [ "$RC_UNAME" = Linux ]; then if [ "$RC_UNAME" = Linux ]; then
no_netdev="-O no_netdev" no_netdev="-O no_netdev"
if mountinfo -q /usr; then if mountinfo -q /usr; then
touch $RC_SVCDIR/usr_premounted touch "$RC_SVCDIR"/usr_premounted
fi fi
fi fi
ebegin "Mounting local filesystems" ebegin "Mounting local filesystems"
@ -40,7 +40,7 @@ stop()
# We never unmount / or /dev or $RC_SVCDIR # We never unmount / or /dev or $RC_SVCDIR
# Bug 381783 # 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}" local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec" no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
@ -52,7 +52,7 @@ stop()
if [ "$RC_UNAME" = Linux ]; then if [ "$RC_UNAME" = Linux ]; then
no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*" 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" no_umounts_r="$no_umounts_r|/usr"
fi fi
fi fi