diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2008-06-08 19:54:05 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-06-08 19:54:05 +0000 |
commit | c7ab83780dc33fbf3d4ad62ae5b8a13cb5036551 (patch) | |
tree | 0ffaf3078c69881084e4a66f1b53a6112055237c | |
parent | Change webkit dep for package rename (diff) | |
download | gentoo-2-c7ab83780dc33fbf3d4ad62ae5b8a13cb5036551.tar.gz gentoo-2-c7ab83780dc33fbf3d4ad62ae5b8a13cb5036551.tar.bz2 gentoo-2-c7ab83780dc33fbf3d4ad62ae5b8a13cb5036551.zip |
Version bump. Fixes bugs #210879, and #214194 (same as #202058). Make sure you hvae the new .26 of device-mapper.
(Portage version: 2.1.5.4)
-rw-r--r-- | sys-fs/lvm2/ChangeLog | 9 | ||||
-rwxr-xr-x | sys-fs/lvm2/files/lvm2-stop.sh-2.02.37 | 65 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.02.37.ebuild | 149 |
3 files changed, 222 insertions, 1 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index 85198c50f722..d16273b51c15 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/lvm2 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.134 2008/04/30 06:53:24 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.135 2008/06/08 19:54:05 robbat2 Exp $ + +*lvm2-2.02.37 (08 Jun 2008) + + 08 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/lvm2-stop.sh-2.02.37, +lvm2-2.02.37.ebuild: + Version bump. Fixes bugs #210879, and #214194 (same as #202058). Make sure + you hvae the new .26 of device-mapper. *lvm2-2.02.36 (30 Apr 2008) diff --git a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37 b/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37 new file mode 100755 index 000000000000..fccc7f9ef699 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37 @@ -0,0 +1,65 @@ +# /lib/rcscripts/addons/lvm-stop.sh +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37,v 1.1 2008/06/08 19:54:05 robbat2 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 + if type mountinfo >/dev/null 2>&1; then + ROOT_DEVICE=`mountinfo -t /` + else + ROOT_DEVICE=`mount | awk '{if($3 == "/" && $1 != "rootfs"){print $1}}'` + fi + + 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 diff --git a/sys-fs/lvm2/lvm2-2.02.37.ebuild b/sys-fs/lvm2/lvm2-2.02.37.ebuild new file mode 100644 index 000000000000..396b1690b8d4 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.37.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.37.ebuild,v 1.1 2008/06/08 19:54:05 robbat2 Exp $ + +inherit eutils multilib + +DESCRIPTION="User-land utilities for LVM2 (device-mapper) software." +HOMEPAGE="http://sources.redhat.com/lvm2/" +SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="readline static clvm cman gulm lvm1 selinux" + +DEPEND=">=sys-fs/device-mapper-1.02.26 + clvm? ( >=sys-cluster/dlm-1.01.00 + cman? ( >=sys-cluster/cman-1.01.00 ) + gulm? ( >=sys-cluster/gulm-1.00.00 ) )" + +RDEPEND="${DEPEND} + !sys-fs/lvm-user + !sys-fs/clvm" + +S="${WORKDIR}/${PN/lvm/LVM}.${PV}" + +pkg_setup() { + use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use" + use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use" +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/lvm.conf-2.02.36.patch +} + +src_compile() { + # Static compile of lvm2 so that the install described in the handbook works + # http://www.gentoo.org/doc/en/lvm2.xml + # fixes http://bugs.gentoo.org/show_bug.cgi?id=84463 + local myconf + local buildmode + + # fsadm is broken, don't include it (2.02.28) + myconf="${myconf} --enable-dmeventd --enable-cmdlib" + + # Most of this package does weird stuff. + # The build options are tristate, and --without is NOT supported + # options: 'none', 'internal', 'shared' + if use static ; then + einfo "Building static LVM, for usage inside genkernel" + myconf="${myconf} --enable-static_link" + buildmode="internal" + else + ewarn "Building shared LVM, it will not work inside genkernel!" + buildmode="shared" + fi + + # dmeventd requires mirrors to be internal, and snapshot available + # so we cannot disable them + myconf="${myconf} --with-mirrors=internal" + myconf="${myconf} --with-snapshots=internal" + + if use lvm1 ; then + myconf="${myconf} --with-lvm1=${buildmode}" + else + myconf="${myconf} --with-lvm1=none" + fi + + # disable O_DIRECT support on hppa, breaks pv detection (#99532) + use hppa && myconf="${myconf} --disable-o_direct" + + if use clvm; then + myconf="${myconf} --with-cluster=${buildmode}" + # 4-state! Make sure we get it right, per bug 210879 + # Valid options are: none, cman, gulm, all + local clvmd="" + use cman && clvmd="cman" + use gulm && clvmd="${clvmd}gulm" + clvmd="${clvmd/cmangulm/all}" + [ -z "${clvmd}" ] && clvmd="none" + myconf="${myconf} --with-clvmd=${clvmd}" + myconf="${myconf} --with-pool=${buildmode}" + else + myconf="${myconf} --with-clvmd=none --with-cluster=none" + fi + + myconf="${myconf} --sbindir=/sbin --with-staticdir=/sbin" + econf $(use_enable readline) \ + $(use_enable selinux) \ + --libdir=/usr/$(get_libdir) \ + ${myconf} \ + CLDFLAGS="${LDFLAGS}" || die + emake || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install + # TODO: At some point in the future, we need to stop installing the static + # as the /sbin/lvm name, and have both variants seperate. + if use static; then + cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \ + || die "Failed to copy lvm.static" + fi + + dodir /$(get_libdir) + # Put these in root so we can reach before /usr is up + for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do + b="${D}"/usr/$(get_libdir)/${i} + if [ -f "${b}".so ]; then + mv -f "${b}".so* "${D}"/$(get_libdir) || die + fi + done + + dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt} + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die + newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die + newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die + newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die + if use clvm; then + newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die + fi + + elog "use flag nocman is deprecated and replaced" + elog "with cman and gulm use flags." + elog "" + elog "use flags clvm,cman and gulm are masked" + elog "by default and need to be unmasked to use them" + elog "" + elog "Rebuild your genkernel initramfs if you are using lvm" + use nolvmstatic && \ + elog "USE=nolvmstatic has changed to USE=static via package.use" + use nolvm1 && \ + elog "USE=nolvm1 has changed to USE=lvm1 via package.use" +} + +pkg_postinst() { + elog "lvm volumes are no longer automatically created for" + elog "baselayout-2 users. If you are using baselayout-2, be sure to" + elog "run: # rc-update add lvm boot" +} + +src_test() { + einfo "Testcases disabled because of device-node mucking" + einfo "If you want them, compile the package and see ${S}/tests" +} |