aboutsummaryrefslogtreecommitdiff
path: root/init.d/mount-ro.in
diff options
context:
space:
mode:
Diffstat (limited to 'init.d/mount-ro.in')
-rw-r--r--init.d/mount-ro.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 7049d4b1..79b2e02e 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="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
- m="$m|/bin|/sbin|/lib|/libexec"
+
+ # Bug 381783
+ local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+
+ local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${rc_svcdir}" x= fs=
+ m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
# RC_NO_UMOUNTS is an env var that can be set by plugins
local IFS="$IFS:"
for x in $no_umounts $RC_NO_UMOUNTS; do
@@ -34,7 +38,7 @@ start()
[ -n "$fs" ] && fs="^($fs)$"
do_unmount "umount -r" \
--skip-point-regex "$m" \
- ${fs:+--skip-fstype-regex} $fs --nonetdev
+ "${fs:+--skip-fstype-regex}" $fs --nonetdev
eoutdent
eend $?
}