summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorEric Edgar <rocket@gentoo.org>2005-06-18 07:11:05 +0000
committerEric Edgar <rocket@gentoo.org>2005-06-18 07:11:05 +0000
commitff9da015696b3cbe7b311b8ba3b54c044562ef2c (patch)
treeecc147e967d16203423f60d7da7c0a92a9d3ae4d /sys-fs
parentManual Manifest commit. (diff)
downloadhistorical-ff9da015696b3cbe7b311b8ba3b54c044562ef2c.tar.gz
historical-ff9da015696b3cbe7b311b8ba3b54c044562ef2c.tar.bz2
historical-ff9da015696b3cbe7b311b8ba3b54c044562ef2c.zip
Fix bug 95591. More flexible command output parsing to handle changes in lvm.conf
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/lvm2/Manifest34
-rwxr-xr-xsys-fs/lvm2/files/lvm2-stop.sh11
2 files changed, 17 insertions, 28 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 69c2f641e9a9..43a7909c4b0d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,32 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e30336a017203e0954d3962aefca8a58 lvm2-2.00.33-r4.ebuild 1282
-MD5 2c5ed7997e4c96d5129f3c9227ca8f67 lvm2-2.00.33.ebuild 949
-MD5 a636df9fc4c3a76e1e274bdad2e4701d lvm2-2.00.15.ebuild 852
-MD5 d2f05ce076e6d82926716a9f7fac4ed6 lvm2-2.00.33-r1.ebuild 1073
MD5 2896cc17098babbb186ab2f3846e4186 lvm2-2.00.08.ebuild 806
MD5 056d25e2914e4167093061a9800e16df lvm2-2.00.15-r1.ebuild 1187
-MD5 27fc8f0d315331f0ebc78ca01b6b5eb7 lvm2-2.01.09.ebuild 1270
+MD5 a636df9fc4c3a76e1e274bdad2e4701d lvm2-2.00.15.ebuild 852
MD5 64b58b520ae926a0ed181185a1d603f3 lvm2-2.00.25.ebuild 949
+MD5 d2f05ce076e6d82926716a9f7fac4ed6 lvm2-2.00.33-r1.ebuild 1073
MD5 22bfbc60fc64c45a89c9d8e1067d26e9 lvm2-2.00.33-r2.ebuild 1043
-MD5 ba0b55d70fa40926d89c5825430bdfd9 ChangeLog 7123
+MD5 2c5ed7997e4c96d5129f3c9227ca8f67 lvm2-2.00.33.ebuild 949
MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250
-MD5 0409dfc70844e92c416235b013569411 files/digest-lvm2-2.00.15-r1 61
-MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r1 61
-MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r2 61
-MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r4 61
-MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990
-MD5 f2e7b2e4a91f96e336f12556975346c6 files/lvm2-stop.sh 1709
+MD5 e30336a017203e0954d3962aefca8a58 lvm2-2.00.33-r4.ebuild 1282
+MD5 ba0b55d70fa40926d89c5825430bdfd9 ChangeLog 7123
+MD5 27fc8f0d315331f0ebc78ca01b6b5eb7 lvm2-2.01.09.ebuild 1270
MD5 7d15c279aadf5df9c1486c878916c893 files/digest-lvm2-2.00.08 61
MD5 0409dfc70844e92c416235b013569411 files/digest-lvm2-2.00.15 61
+MD5 0409dfc70844e92c416235b013569411 files/digest-lvm2-2.00.15-r1 61
MD5 1eebcc64220260347d8a9b9336684346 files/digest-lvm2-2.00.25 61
MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33 61
+MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r1 61
+MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r2 61
+MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r4 61
MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCs8VEI1lqEGTUzyQRAr4GAKCajSldtv2aTZWhd0Mwux9aBazagACgiPfl
-9RzFC2cN1gjy4ibgqpq6dxs=
-=M/TK
------END PGP SIGNATURE-----
+MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990
+MD5 fea6b4e78b9e73071f7131169fa9ab6e files/lvm2-stop.sh 1775
diff --git a/sys-fs/lvm2/files/lvm2-stop.sh b/sys-fs/lvm2/files/lvm2-stop.sh
index 1ecdbafcd4a8..0fac0a61b514 100755
--- a/sys-fs/lvm2/files/lvm2-stop.sh
+++ b/sys-fs/lvm2/files/lvm2-stop.sh
@@ -1,8 +1,7 @@
# /lib/rcscripts/addons/lvm2-stop.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh,v 1.3 2005/05/20 04:30:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh,v 1.4 2005/06/18 07:11:05 rocket Exp $
# Stop LVM2
-
if [ -x /sbin/vgchange ] && \
[ -x /sbin/lvdisplay ] && \
[ -x /sbin/vgdisplay ] && \
@@ -16,8 +15,8 @@ then
# functionality as described in this forum thread
#https://www.redhat.com/archives/linux-lvm/2001-May/msg00523.html
- LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|awk '{print $3}'|sort`
- VOLUME_GROUPS=`vgdisplay |grep "VG Name"|awk '{print $3}'|sort`
+ LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|sed -e 's/.*LV Name\s*\(.*\)/\1/'|sort`
+ VOLUME_GROUPS=`vgdisplay |grep "VG Name"|sed -e 's/.*VG Name\s*\(.*\)/\1/'|sort`
for x in ${LOGICAL_VOLUMES}
do
LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
@@ -31,7 +30,7 @@ then
for x in ${VOLUME_GROUPS}
do
- VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|awk '{print $3}'`
+ VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|sed -e 's/.*Open LV\s*\(.*\)/\1/'`
if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
then
ebegin " Shutting Down volume group: ${x} "
@@ -42,7 +41,7 @@ then
for x in ${LOGICAL_VOLUMES}
do
- LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
+ LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|sed -e 's/.*# open\s*\(.*\)/\1/'`
if [ "${LV_IS_ACTIVE}" = 1 ]
then