sys-fs/lvm2: bump to fix lvmetad init script depend

In my previous bump I incorrectly left the hardcoded dependency on
lvmetad so the lvm script still always depended on lvmetad. This fixes
that and makes it truly dynamic and adds instructions so that people
can ensure their next boot works properly.

Package-Manager: portage-2.2.26
Signed-off-by: Doug Goldstein <cardoe@gentoo.org>

diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r3 b/sys-fs/lvm2/files/lvm.rc-2.02.116-r4
similarity index 99%
rename from sys-fs/lvm2/files/lvm.rc-2.02.116-r3
rename to sys-fs/lvm2/files/lvm.rc-2.02.116-r4
index 059e8805a35e419d40d42c623b95d7158064a9b8..8478c239f8f9d291773caab7da9d7daeac32dd3b 100644 (file)
--- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r3
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.116-r4
@@ -21,7 +21,6 @@ _need_lvmetad()
 depend() {
        before checkfs fsck
        after modules device-mapper
-       need lvmetad sysfs
        # We may use lvmetad based on the configuration. If we added lvmetad
        # support while lvm2 is running then we aren't dependent on it. For the
        # more common case, if its disabled in the config we aren't dependent
@@ -35,7 +34,7 @@ depend() {
                        _need="${_need} lvmetad"
                fi
        fi
-       need ${_need}
+       need sysfs ${_need}
 }
 
 config='global { locking_dir = "/run/lock/lvm" }'

diff --git a/sys-fs/lvm2/lvm2-2.02.116-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
similarity index 97%
rename from sys-fs/lvm2/lvm2-2.02.116-r3.ebuild
rename to sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
index bbb4279c2222d585e66f6eb2433d0c6f96c396ac..5d54576bb1874500e110093877a7c1252a3b9bf8 100644 (file)
--- a/sys-fs/lvm2/lvm2-2.02.116-r3.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -230,7 +230,7 @@ src_install() {
 
        if use !device-mapper-only ; then
                newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-               newinitd "${FILESDIR}"/lvm.rc-2.02.116-r3 lvm
+               newinitd "${FILESDIR}"/lvm.rc-2.02.116-r4 lvm
                newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
 
                newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
@@ -270,6 +270,10 @@ pkg_postinst() {
        ewarn
        ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
        ewarn "to enable lvm autoactivation and metadata caching."
+       ewarn
+       ewarn "After enabling or disabling lvmetad in /etc/lvm/lvm.conf you must"
+       ewarn "run the following to update the init script dependencies: "
+       ewarn "# rc-update -u"
 }
 
 src_test() {