[patch] 0001-Fix-regex-pattern-for-umounts-during-shutdown.patch

0001-Fix-regex-pattern-for-umounts-during-shutdown.patch (text/plain), 2.29 KB, created by Christian Ruppert (idl0r) on 2011-09-11 13:21:30 UTC

From e8cf41f85456a137128431c891bb6db8b1511a9e Mon Sep 17 00:00:00 2001
From: Christian Ruppert <[e-mail]>
Date: Sun, 11 Sep 2011 15:12:54 +0200
Subject: [PATCH] Fix regex pattern for umounts during shutdown

This patch fixes the regex pattern for /lib -> /lib(32|64)?
as well as the pattern for RC_SVCDIR if it contains /lib(32|64)?/.
This fixes bug 381783.
---
 init.d/localmount.in |   10 +++++++---
 init.d/mount-ro.in   |   10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 166ee77..3fbc071 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -34,8 +34,12 @@ start()
 stop()
 {
 	# We never unmount / or /dev or $RC_SVCDIR
-	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
+
+	# Bug 381783
+	local rc_svcdir=$(echo $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"
 	# 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
@@ -69,7 +73,7 @@ stop()
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount --skip-point-regex "$no_umounts_r" \
-		${fs:+--skip-fstype-regex} $fs --nonetdev
+		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 
 	return 0
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 7049d4b..79b2e02 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 $?
 }
-- 
1.7.3.4