Update lvm2-stop.sh for bug 57229

Package-Manager: portage-2.0.53_rc6

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 93917d6ec53e970facb8963c1c36bcd5b5b2234f..4a026d30441c61beaa740f1f2914e71ef128437c 100644 (file)
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.47 2005/10/14 02:58:05 rocket Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.48 2005/11/02 21:01:32 rocket Exp $
+
+  02 Nov 2005; Eric Edgar <rocket@gentoo.org> files/lvm2-stop.sh:
+  Update lvm2-stop.sh for bug 57229
 
 *lvm2-2.01.14 (14 Oct 2005)
 

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 221edfb7f972f9b3f021af7580e1af1f834d0cff..657845bd8ac63a7ae4c53efca396cab652c6c2e4 100644 (file)
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,12 +1,12 @@
-MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250
-MD5 97aaa43ef70e84140f8d1b940eb73025 lvm2-2.01.09.ebuild 1277
-MD5 03b3cb1f6d49f4b6fe96c6ad3a9c47f0 lvm2-2.01.09-r1.ebuild 1399
-MD5 4a69a466c3d8594ccd1ffc33d25c8f4b ChangeLog 8069
-MD5 bfbb6af0f144e530589562ca3b79c61a lvm2-2.01.13.ebuild 1402
-MD5 b21dfc442b0736529f8950c5f2081c85 lvm2-2.01.14.ebuild 1400
+MD5 978eac9c193536df555068459c951079 ChangeLog 8172
 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09 61
-MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990
-MD5 fea6b4e78b9e73071f7131169fa9ab6e files/lvm2-stop.sh 1775
 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09-r1 61
 MD5 d1e295db9aa6771cdc6506033bc98f69 files/digest-lvm2-2.01.13 61
 MD5 bd5702de4e53595969129c176cb028dc files/digest-lvm2-2.01.14 61
+MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990
+MD5 00655aa59deac8796636fc54ede221ed files/lvm2-stop.sh 1940
+MD5 03b3cb1f6d49f4b6fe96c6ad3a9c47f0 lvm2-2.01.09-r1.ebuild 1399
+MD5 97aaa43ef70e84140f8d1b940eb73025 lvm2-2.01.09.ebuild 1277
+MD5 bfbb6af0f144e530589562ca3b79c61a lvm2-2.01.13.ebuild 1402
+MD5 b21dfc442b0736529f8950c5f2081c85 lvm2-2.01.14.ebuild 1400
+MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250

diff --git a/sys-fs/lvm2/files/lvm2-stop.sh b/sys-fs/lvm2/files/lvm2-stop.sh
index 0fac0a61b514b0eef34809ece23b3fd8ada5fde0..b85b465b27c28f32648d22b86fce42729ac1ce66 100755 (executable)
--- a/sys-fs/lvm2/files/lvm2-stop.sh
+++ b/sys-fs/lvm2/files/lvm2-stop.sh
@@ -1,5 +1,5 @@
 # /lib/rcscripts/addons/lvm2-stop.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh,v 1.4 2005/06/18 07:11:05 rocket Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh,v 1.5 2005/11/02 21:01:32 rocket Exp $
 
 # Stop LVM2
 if [ -x /sbin/vgchange ] && \
@@ -46,7 +46,10 @@ then
                then
                        
                        ROOT_DEVICE=`mount|grep " / "|awk '{print $1}'`
-                       if [ ! ${ROOT_DEVICE} = ${x} ]
+                       MOUNTED_DEVICE=${x}
+                       [ -L ${ROOT_DEVICE} ] && ROOT_DEVICE="`/bin/readlink ${ROOT_DEVICE}`"
+                       [ -L ${x} ] && MOUNTED_DEVICE="`/bin/readlink ${x}`"
+                       if [ ! ${ROOT_DEVICE} = ${MOUNTED_DEVICE} ]
                        then
                                ewarn "  Unable to shutdown: ${x} "
                        fi