Fixed bug #139331.

Package-Manager: portage-2203-svn

6 files changed, 123 insertions, 28 deletions

diff --git a/sys-fs/clvm/ChangeLog b/sys-fs/clvm/ChangeLog
index f54a98d0232c..649044b0e591 100644
--- a/sys-fs/clvm/ChangeLog
+++ b/sys-fs/clvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/clvm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v 1.13 2006/07/06 08:10:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v 1.14 2006/07/13 08:23:55 xmerlin Exp $
+
+  13 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> +files/lvm2-start.sh,
+  +files/lvm2-stop.sh, clvm-2.01.15.ebuild, clvm-2.02.05.ebuild:
+  Fixed bug #139331, thanks to Ramon <ramon@vanalteren.nl>.
 
   06 Jul 2006; Simon Stelling <blubb@gentoo.org> clvm-2.02.05.ebuild:
   added ~amd64 keyword
diff --git a/sys-fs/clvm/Manifest b/sys-fs/clvm/Manifest
index e06cd17d3ec7..0a8803959039 100644
--- a/sys-fs/clvm/Manifest
+++ b/sys-fs/clvm/Manifest
@@ -1,28 +1,19 @@
-AUX clvmd.rc 3628 RMD160 b4b8761057bb878c44b26cb07dbbb7e0d9c7758a SHA1 1ca803fad995353760698a6e90e5ead78892aed0 SHA256 0c4c2b4f8e75a9213a754d44ad11ffd05ac972c85b3f1212ebf776946b8771ce
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d3f63cfe5654c059f9b529af397d767e ChangeLog 2173
+MD5 2d9207e41ca2fa01c6cce009babe8316 clvm-2.01.15.ebuild 1293
+MD5 778abdfc0bcad6162be0721908c00186 clvm-2.02.05.ebuild 1300
 MD5 f0327505c09c5ea6558e322049400d2a files/clvmd.rc 3628
-RMD160 b4b8761057bb878c44b26cb07dbbb7e0d9c7758a files/clvmd.rc 3628
-SHA256 0c4c2b4f8e75a9213a754d44ad11ffd05ac972c85b3f1212ebf776946b8771ce files/clvmd.rc 3628
-DIST LVM2.2.01.15.tgz 466225
-DIST LVM2.2.02.05.tgz 473621
-EBUILD clvm-2.01.15.ebuild 1154 RMD160 091dd87bec07488329d90ffa023df8f0dab00492 SHA1 920ffe7a29c87e465b02f4e176465d5c4f0838e1 SHA256 7d6e8774baf0b25799b666b9064539740f45220ac226225fcdf4673b54da588c
-MD5 17bcdaa78974b3698bd64d4fbb4a4ab1 clvm-2.01.15.ebuild 1154
-RMD160 091dd87bec07488329d90ffa023df8f0dab00492 clvm-2.01.15.ebuild 1154
-SHA256 7d6e8774baf0b25799b666b9064539740f45220ac226225fcdf4673b54da588c clvm-2.01.15.ebuild 1154
-EBUILD clvm-2.02.05.ebuild 1160 RMD160 3e015e6cce587acb2d569d91d9cdc4c0ab07e4db SHA1 bed9c60274d1c74d8e15f4efc74c17c99f102078 SHA256 7e9488e1db90dbc39f981728a9b6aa0de9137977e886da58de4bff1047cc11d0
-MD5 2a6cfc419172904f71d981671e4f666f clvm-2.02.05.ebuild 1160
-RMD160 3e015e6cce587acb2d569d91d9cdc4c0ab07e4db clvm-2.02.05.ebuild 1160
-SHA256 7e9488e1db90dbc39f981728a9b6aa0de9137977e886da58de4bff1047cc11d0 clvm-2.02.05.ebuild 1160
-MISC ChangeLog 1969 RMD160 89369404ff7d1cf337eb5fff47c0505d80bc3564 SHA1 f50c54a1c6de4317e7aca5722380cd347ed57e87 SHA256 851286a0ea017b41485ede970634eab046f275ef3326c35e89893b20a17f4324
-MD5 5f1f710e0107c9c64bad126e40b9f0f2 ChangeLog 1969
-RMD160 89369404ff7d1cf337eb5fff47c0505d80bc3564 ChangeLog 1969
-SHA256 851286a0ea017b41485ede970634eab046f275ef3326c35e89893b20a17f4324 ChangeLog 1969
-MISC metadata.xml 223 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d SHA1 033d2c47eb2bfe68e657ac2d68a7bfd28aab5b22 SHA256 b75b89c431f244420a0c81f9157c9fc656a919a8aac011778e1b410f70851bd3
-MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d metadata.xml 223
-SHA256 b75b89c431f244420a0c81f9157c9fc656a919a8aac011778e1b410f70851bd3 metadata.xml 223
 MD5 453d512666fd78d04c143e0a985f8665 files/digest-clvm-2.01.15 61
-RMD160 1d822f1408a29f402b8eee2d12f7a2d60d4d7d4c files/digest-clvm-2.01.15 61
-SHA256 f969e5579c2e5d04be874dd03595938a87c0175479485d508abcab609f9a60a7 files/digest-clvm-2.01.15 61
 MD5 fb3f51b9f1baa5529bc23e279469eee1 files/digest-clvm-2.02.05 61
-RMD160 f06b3bf94fc703740f5f085b56cb3399d5fe13dd files/digest-clvm-2.02.05 61
-SHA256 5ac8e83c12f63d8c1f57ed0e5d537131188541f2f29c03e393e94de62aa3849d files/digest-clvm-2.02.05 61
+MD5 e3978cd20e174bd50df92ec912a27343 files/lvm2-start.sh 997
+MD5 d6edbc453e3e26178364037cd98abea2 files/lvm2-stop.sh 1947
+MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEthKKgMUyd/cdjWsRAgPUAJ9iPudj0tEag6VUnJ9DqkN18XkUSgCfYt/v
+QxVCd4nvUVGhIG7iLT18m70=
+=aL88
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/clvm/clvm-2.01.15.ebuild b/sys-fs/clvm/clvm-2.01.15.ebuild
index 90c52cb81dd7..29479bd209bd 100644
--- a/sys-fs/clvm/clvm-2.01.15.ebuild
+++ b/sys-fs/clvm/clvm-2.01.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.01.15.ebuild,v 1.3 2006/05/28 00:31:53 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.01.15.ebuild,v 1.4 2006/07/13 08:23:55 xmerlin Exp $
 
 MY_P="${PN/clvm/LVM2}.${PV}"
 
@@ -47,4 +47,9 @@ src_install() {
 	dodoc COPYING* INSTALL README VERSION WHATS_NEW doc/*.{conf,c,txt}
 
 	newinitd ${FILESDIR}/clvmd.rc clvmd || die
+
+	insinto /lib/rcscripts/addons
+	newins ${FILESDIR}/lvm2-start.sh lvm-start.sh || die
+	newins ${FILESDIR}/lvm2-stop.sh lvm-stop.sh || die
+
 }
diff --git a/sys-fs/clvm/clvm-2.02.05.ebuild b/sys-fs/clvm/clvm-2.02.05.ebuild
index c4528fe0d8c5..d4eddc3b1c66 100644
--- a/sys-fs/clvm/clvm-2.02.05.ebuild
+++ b/sys-fs/clvm/clvm-2.02.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.05.ebuild,v 1.2 2006/07/06 08:10:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.05.ebuild,v 1.3 2006/07/13 08:23:55 xmerlin Exp $
 
 MY_P="${PN/clvm/LVM2}.${PV}"
 
@@ -47,4 +47,8 @@ src_install() {
 	dodoc COPYING* INSTALL README VERSION WHATS_NEW doc/*.{conf,c,txt}
 
 	newinitd ${FILESDIR}/clvmd.rc clvmd || die
+
+	insinto /lib/rcscripts/addons
+	newins ${FILESDIR}/lvm2-start.sh lvm-start.sh || die
+	newins ${FILESDIR}/lvm2-stop.sh lvm-stop.sh || die
 }
diff --git a/sys-fs/clvm/files/lvm2-start.sh b/sys-fs/clvm/files/lvm2-start.sh
new file mode 100755
index 000000000000..d367a203cf8b
--- /dev/null
+++ b/sys-fs/clvm/files/lvm2-start.sh
@@ -0,0 +1,30 @@
+# /lib/rcscripts/addons/lvm2-start.sh
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh,v 1.3 2006/07/13 08:23:55 xmerlin Exp $
+
+# LVM support for /usr, /home, /opt ....
+# This should be done *before* checking local
+# volumes, or they never get checked.
+			        
+# NOTE: Add needed modules for LVM or RAID, etc
+#       to /etc/modules.autoload if needed
+if [[ -z ${CDBOOT} ]] && [[ -x /sbin/vgscan ]] ; then
+	if [[ -e /proc/modules ]] && \
+	   ! grep -qs 'device-mapper' /proc/{devices,misc}
+	then
+		modprobe dm-mod &>/dev/null
+	fi
+
+	if [[ -d /proc/lvm ]] || grep -qs 'device-mapper' /proc/{devices,misc} ; then
+		ebegin "Setting up the Logical Volume Manager"
+		#still echo stderr for debugging
+		/sbin/vgscan --mknodes --ignorelockingfailure >/dev/null
+		if [[ $? == 0 ]] && [[ -x /sbin/vgchange ]] && \
+		   [[ -f /etc/lvmtab || -d /etc/lvm ]]
+		then
+			/sbin/vgchange --ignorelockingfailure -a y >/dev/null
+		fi
+		eend $? "Failed to setup the LVM"
+	fi
+fi
+
+# vim:ts=4
diff --git a/sys-fs/clvm/files/lvm2-stop.sh b/sys-fs/clvm/files/lvm2-stop.sh
new file mode 100755
index 000000000000..252c52d3b32b
--- /dev/null
+++ b/sys-fs/clvm/files/lvm2-stop.sh
@@ -0,0 +1,61 @@
+# /lib/rcscripts/addons/lvm2-stop.sh
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh,v 1.3 2006/07/13 08:23:55 xmerlin Exp $
+
+# Stop LVM2
+if [ -x /sbin/vgchange ] && \
+   [ -x /sbin/lvdisplay ] && \
+   [ -x /sbin/vgdisplay ] && \
+   [ -x /sbin/lvchange ] && \
+   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
+   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
+then
+	einfo "Shutting down the Logical Volume Manager"
+	# If these commands fail it is not currently an issue
+	# as the system is going down anyway based on the current LVM 
+	# functionality as described in this forum thread
+	#https://www.redhat.com/archives/linux-lvm/2001-May/msg00523.html
+
+	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}'`
+		if [ "${LV_IS_ACTIVE}" = 0 ]
+		then
+			ebegin "  Shutting Down logical volume: ${x} "
+			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
+			eend $?
+		fi
+	done
+
+	for x in ${VOLUME_GROUPS}
+	do
+		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} "
+			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
+			eend
+		fi
+	done
+
+	for x in ${LOGICAL_VOLUMES}
+	do
+		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|sed -e 's/.*# open\s*\(.*\)/\1/'`
+		if [ "${LV_IS_ACTIVE}" = 1 ]
+		then
+			
+			ROOT_DEVICE=`mount|grep " / "|awk '{print $1}'`
+			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
+		fi
+	done
+	einfo "Finished Shutting down the Logical Volume Manager"
+fi
+
+# vim:ts=4