From 2d180551ef5f2541e22a5eaf90b4efc7aadba914 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sun, 11 Sep 2011 15:12:54 +0200 Subject: 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. X-Gentoo-Bug: 381783 X-Gentoo-Bug-URL: https://bugs.gentoo.org/381783 --- init.d/localmount.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'init.d/localmount.in') diff --git a/init.d/localmount.in b/init.d/localmount.in index 166ee774..3fbc0716 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 -- cgit v1.2.3