make sure directory is mounted before we unmount it #70253

diff --git a/net-fs/idmapd/Manifest b/net-fs/idmapd/Manifest
index 44cd7cb9e717ba9bd8b3fb65e1ef7ba97ba31097..5fd5f5c2aff3108fd914395c5303fc2bc7f08b9a 100644 (file)
--- a/net-fs/idmapd/Manifest
+++ b/net-fs/idmapd/Manifest
@@ -4,4 +4,4 @@ MD5 a3dd8511b8874ce1b494dce2472c709c metadata.xml 159
 MD5 8b91dd662c9509cf90c2998397d2a69b files/digest-idmapd-1.5 62
 MD5 c0c2fa8dc80b342974cf24b421011371 files/1.5-no-string.patch 336
 MD5 e5353d0bcfafedfef9f2ad24197963ab files/idmapd.confd 288
-MD5 334835761aefec42618ea4dda92f1590 files/idmapd.rc 862
+MD5 e20b0ee27dba0f85bbf21526a8b009cf files/idmapd.rc 985

diff --git a/net-fs/idmapd/files/idmapd.rc b/net-fs/idmapd/files/idmapd.rc
index f2fe6ec43dc7625b55b130f3c760cc1bf074d2f7..227979b7738e248b2f8a2cdffbb89342d5ac14db 100644 (file)
--- a/net-fs/idmapd/files/idmapd.rc
+++ b/net-fs/idmapd/files/idmapd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/idmapd/files/idmapd.rc,v 1.5 2004/11/08 05:08:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/idmapd/files/idmapd.rc,v 1.6 2004/11/08 05:11:29 vapier Exp $
 
 depend() {
        need net
@@ -24,11 +24,18 @@ start() {
 }
 
 stop() {
+       local ret
        ebegin "Stopping idmapd"
        start-stop-daemon --stop --quiet --exec /sbin/idmapd
-       eend $?
+       ret=$?
+       eend ${ret}
+
+       if grep -q "rpc_pipefs /var/lib/rpc_pipes" /proc/mounts ; then
+               ebegin "Unmounting RPC pipefs"
+               umount /var/lib/rpc_pipes
+               ret=$?
+               eend ${ret} "Error unmounting RPC pipefs"
+       fi
 
-       ebegin "Unmounting RPC pipefs"
-       umount /var/lib/rpc_pipes
-       eend $? "Error unmounting RPC pipefs"
+       return ${ret}
 }