From 1092096c02bf26dd1de86403ceb4bf791e5254db Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 14 Jun 2010 22:26:52 +0000 Subject: [PATCH] Bug #323881: Need to explictly start to monitor LVM devices with new init re-arrangement. Please notice the new init.d file, lvm-monitoring, that you should add to your boot runlevel if you require LV monitoring. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-fs/lvm2/ChangeLog | 10 +- sys-fs/lvm2/Manifest | 4 +- .../files/lvm-monitoring.initd-2.02.67-r2 | 45 ++++ sys-fs/lvm2/lvm2-2.02.67-r2.ebuild | 254 ++++++++++++++++++ 4 files changed, 311 insertions(+), 2 deletions(-) create mode 100644 sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 create mode 100644 sys-fs/lvm2/lvm2-2.02.67-r2.ebuild diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index d7f0459dd9be..d5dce801ea51 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/lvm2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.212 2010/06/09 22:41:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.213 2010/06/14 22:26:52 robbat2 Exp $ + +*lvm2-2.02.67-r2 (14 Jun 2010) + + 14 Jun 2010; Robin H. Johnson + +files/lvm-monitoring.initd-2.02.67-r2, +lvm2-2.02.67-r2.ebuild: + Bug #323881: Need to explictly start to monitor LVM devices with new init + re-arrangement. Please notice the new init.d file, lvm-monitoring, that + you should add to your boot runlevel if you require LV monitoring. *lvm2-2.02.67-r1 (09 Jun 2010) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 6f7a31e11582..87b6addb0c96 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -12,6 +12,7 @@ AUX device-mapper.rc-2.02.67-r1 841 RMD160 a6bb66fd8d2f30e168658c557efd99b4a277a AUX dm-start.sh 2114 RMD160 96a6b824e22d5c04f2710f98cda5361bde6a265c SHA1 b18c79802ab8bac9befe4a32cce6fe13beb3134c SHA256 c064c3e2a1d128a6326b539a675f1a6cf88b75f5526222e232d53ea1468a9bcf AUX dmeventd.initd-2.02.67-r1 683 RMD160 23e3787c3bd9d99a1d73d4688c91ec1198f4a7e6 SHA1 b00215e6297d69330df834e291b809c847396c28 SHA256 84e157b1b99b9fddfc97ab95bc6d37bfa4378578458744447e9478ebe6fc821b AUX dmtab 416 RMD160 d5da257f9ac48af9e831dbd6591e608577d87717 SHA1 f37631cb644b8a242a0426375b1b6acee0bde399 SHA256 e2e22bbe13fb97ec9a68659daa275b1d22fd0a3fd21e76b1f4bfba504a8bd7b5 +AUX lvm-monitoring.initd-2.02.67-r2 1178 RMD160 aa6a6abf7a1620450e91143ca0832ab12d75068b SHA1 7ea4852c36dbaf894c15d7649f233d44ec020a38 SHA256 a0f88e471a79a20561170a52b8f928f071686492e5cf3ef5f6e1f3377befc069 AUX lvm.conf-2.02.33.patch 3136 RMD160 c0292c39db064f0a4151ffccdc441be2fa78f8cf SHA1 8dbcbf66a841cc8acd889e174095df9932813a3e SHA256 63a8c21186f47979cb628970dca12df2a9f319745488a4d8a1e01f238a7fc711 AUX lvm.conf-2.02.36.patch 3118 RMD160 b19039d550cd81d46f77d493cb6c5507a3fd66ee SHA1 dd4f4892c4b423348a764c1373ed81959ca0772b SHA256 85abba15c2dc52af9d518140e210abba852df83deb7740a19be3987a64f677f9 AUX lvm.conf-2.02.45.patch 2657 RMD160 9f74ca92257162c978a690209878691fe13456b5 SHA1 9beccaa7933b9e53651b155bf6262229306e010f SHA256 f45a4ea427c38ca001ffd83eb73008b486d87ad8bf409d1e102a1eac386148d1 @@ -94,6 +95,7 @@ EBUILD lvm2-2.02.63-r1.ebuild 7570 RMD160 14640b0ec48c6906085c14b58357d02864f6fa EBUILD lvm2-2.02.63-r2.ebuild 7708 RMD160 5e0176e9d4cdceba012dab3c6f9a929a8363dc91 SHA1 0f097f2822fb8ce1fe8b60d6f5c8870ff89af1ef SHA256 0aea1f557449094375ad26e6215f5b26beeef444c54fbfb07183729c4a04a5fd EBUILD lvm2-2.02.64.ebuild 7926 RMD160 ad843ab85e71c5752096d60446c8db5061e6b681 SHA1 cbc495d15de2b1ffa333ed2dce01835f6a1147d1 SHA256 a4a2ba51fa1d46a423cb1ae8adf942c0b2c7ff7f12298b4dc89c11367744bf00 EBUILD lvm2-2.02.67-r1.ebuild 8116 RMD160 e364ae957d7644b8db1145c8bbe021c084eabd61 SHA1 f3ab30befa52fe8775ac1e11dbbe0e67559fbcd3 SHA256 db68e52639f4509bbd24bb4a8fd97be82be54be3caa7e94f06fbd020e2cc0b64 +EBUILD lvm2-2.02.67-r2.ebuild 8194 RMD160 154e81d345d91bfa01cda876c24b6789649537ac SHA1 25d7fd05ef63bbaedd7aa5f5e1b5fcd8b29e000d SHA256 e89e49c478ea582f5bb03186851cbbed33c376ffe06b630798a5ee8b1996a132 EBUILD lvm2-2.02.67.ebuild 8110 RMD160 aaf4a019266f6f63091e3fbb8de92bc5ce26f99a SHA1 0ba61b30d452f19563d186df511828de3d08a06b SHA256 85f7d288549b04e66f2a6cdb0db85e4f787bd331e819312a6a69729f206cd801 -MISC ChangeLog 38263 RMD160 eedb0a6c31a71b879f9d064081278c33f249c39c SHA1 3f5e9628a9c2c8af780545773a41ace684dff70d SHA256 02d8e5a51bec6e9ed9e15af6b6aff842f7eabc1bd6bb3b53f9761d08f076f2b6 +MISC ChangeLog 38635 RMD160 6513367ecb44c0c9cd8e7c3f35b2f572086dba0f SHA1 bb2519bd2d5d37d830b5f666c4687eb760c4d744 SHA256 42a6e4858c9b304aba9e542dc86141e3bee1e20afa390660485a80fcd474169a MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 new file mode 100644 index 000000000000..67091a04f941 --- /dev/null +++ b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 @@ -0,0 +1,45 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2,v 1.1 2010/06/14 22:26:52 robbat2 Exp $ + +# This script is based on upstream file +# LVM2.2.02.67/scripts/lvm2_monitoring_init_red_hat.in + +depend() { + # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that + # means dmeventd is NOT notified, as it cannot be safely running + need lvm dmeventd +} + +VGCHANGE=/sbin/vgchange +VGS=/sbin/vgs + +start() { + # TODO do we want to separate out already active groups only? + VGSLIST=`$VGS --noheadings -o name 2> /dev/null` + for vg in $VGSLIST + do + ebegin "Starting LVM monitoring for VG $vg:" + $VGCHANGE --monitor y --poll y $vg + ret2=$? + eend $ret2 + [[ $ret2 -ne 0 ]] && ret=$ret2 + done + return $ret +} + +stop() { + ret=0 + # TODO do we want to separate out already active groups only? + VGSLIST=`$VGS --noheadings -o name 2> /dev/null` + for vg in $VGSLIST + do + ebegin "Stopping LVM monitoring for VG $vg:" + $VGCHANGE --monitor n $vg + ret2=$? + eend $ret2 + [[ $ret2 -ne 0 ]] && ret=$ret2 + done + return $ret +} diff --git a/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild new file mode 100644 index 000000000000..1bc6d9dbd5d3 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild @@ -0,0 +1,254 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild,v 1.1 2010/06/14 22:26:52 robbat2 Exp $ + +EAPI=2 +inherit eutils multilib toolchain-funcs autotools + +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 + ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +IUSE="readline +static clvm cman +lvm1 selinux" + +DEPEND_COMMON="!!sys-fs/device-mapper + clvm? ( =sys-cluster/dlm-2* + cman? ( =sys-cluster/cman-2* ) ) + || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 )" + +RDEPEND="${DEPEND_COMMON} + !=sys-apps/util-linux-2.16" + +DEPEND="${DEPEND_COMMON} + dev-util/pkgconfig" + +S="${WORKDIR}/${PN/lvm/LVM}.${PV}" + +pkg_setup() { + # 1. Genkernel no longer copies /sbin/lvm blindly. + # 2. There are no longer any linking deps in /usr. + if use static; then + elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" + elog "their static versions. If you need the static binaries," + elog "you must append .static the filename!" + fi +} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + epatch "${FILESDIR}"/lvm.conf-2.02.67.patch + + # Should not be needed due to upstream re-arrangement of build + #epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch + # Should not be need with new upstream udev rules + #epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch + + # Merged upstream: + #epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch + # Merged upstream: + #epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch + # Merged upstream: + #epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch + # Fixed differently upstream: + #epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch + + epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch + epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch + # bug 318513 + epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch + # bug 301331 + epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch + + eautoreconf +} + +src_configure() { + local myconf + local buildmode + + myconf="${myconf} --enable-dmeventd" + myconf="${myconf} --enable-cmdlib" + myconf="${myconf} --enable-applib" + myconf="${myconf} --enable-fsadm" + + # 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" + buildmode="internal" + # This only causes the .static versions to become available + # For recent systems, there are no linkages against anything in /usr anyway. + # We explicitly provide the .static versions so that they can be included in + # initramfs environments. + myconf="${myconf} --enable-static_link" + 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 + # + # 2009/02: + # gulm is removed now, now dual-state: + # cman, none + # all still exists, but is not needed + # + # 2009/07: + # TODO: add corosync and re-enable ALL + local clvmd="" + use cman && clvmd="cman" + #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 + --with-dmeventd-path=/sbin/dmeventd" + econf $(use_enable readline) \ + $(use_enable selinux) \ + --enable-pkgconfig \ + --libdir=/$(get_libdir) \ + --with-usrlibdir=/usr/$(get_libdir) \ + --enable-udev_rules \ + --enable-udev_sync \ + --with-udevdir=/$(get_libdir)/udev/rules.d/ \ + ${myconf} \ + CLDFLAGS="${LDFLAGS}" || die +} + +src_compile() { + einfo "Doing symlinks" + pushd include + emake || die "Failed to prepare symlinks" + popd + + einfo "Starting main build" + emake || die "compile fail" +} + +src_install() { + emake DESTDIR="${D}" install || die "Failed to emake install" + + # All of this was change by upstream, and if we don't get any problems, we + # can probably drop it in .65 + #X## Revamp all of our library handling for bug #316571 + #X## Upstream build script puts a lot of this stuff into /usr/lib regardless of + #X## libdir variable. + #X#dodir /$(get_libdir) + #X## .so -> /$(get_libdir) + #X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir) + #X#[[ "$(get_libdir)" != "lib" ]] && \ + #X# mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir) + #X## .a -> /usr/$(get_libdir) + #X#[[ "$(get_libdir)" != "lib" ]] && \ + #X# mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir) + #X## The upstream symlinks are borked. lets rebuild them instead. + #X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \ + #X# | xargs rm -f 2>/dev/null + #X#for i in "${D}"/$(get_libdir)/*.so.* ; do + #X# b="${i//*\/}" o="${b/.so.*/.so}" + #X# ln -s "${b}" "${D}/$(get_libdir)/${o}" + #X#done + #X## Now enable building properly + #X#for i in \ + #X# libdevmapper-event{,-lvm2{,mirror,snapshot}} \ + #X# libdevmapper \ + #X# liblvm2{format1,snapshot,cmd,app} \ + #X# ; do + #X# gen_usr_ldscript ${i}.so || die + #X#done + + dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt} + insinto /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die + newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die + newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 lvm || die + newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || die + newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die + if use clvm; then + newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die + newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die + fi + + # move shared libs to /lib(64) + dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a" + #gen_usr_ldscript libdevmapper.so + + dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd + doman "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8 + newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd + + insinto /etc + doins "${FILESDIR}"/dmtab + insinto /$(get_libdir)/rcscripts/addons + doins "${FILESDIR}"/dm-start.sh + + # Device mapper stuff + newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 device-mapper || die + newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die + + newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die + dolib.a daemons/dmeventd/libdevmapper-event.a \ + || die "dolib.a libdevmapper-event.a" + #gen_usr_ldscript libdevmapper-event.so + + #insinto /etc/udev/rules.d/ + #newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die + + # do not rely on /lib -> /libXX link + sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/* + + elog "USE flag nocman is deprecated and replaced" + elog "with the cman USE flag." + elog "" + elog "USE flags clvm and cman are masked" + elog "by default and need to be unmasked to use them" + elog "" + elog "If you are using genkernel and root-on-LVM, rebuild the initramfs." +} + +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" + elog "Do NOT add it if you are using baselayout-1 still." +} + +src_test() { + einfo "Testcases disabled because of device-node mucking" + einfo "If you want them, compile the package and see ${S}/tests" +} -- 2.26.2