commit:     4ca3673c18a618a6599aa232b642b9cdd29783c2
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Feb 19 21:06:39 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Feb 19 21:06:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=4ca3673c
sys-fs/lvm2: version bump to 2.02.166-r2

 sys-fs/lvm2/Manifest                                      |  4 ++--
 .../lvm2/files/{lvm.rc-2.02.166-r1 => lvm.rc-2.02.166-r2} | 15 +++++++++++++--
 .../{lvm2-2.02.166-r1.ebuild => lvm2-2.02.166-r2.ebuild}  |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 2801e9a..0b156fb 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -8,7 +8,7 @@ AUX lvm-monitoring.initd-2.02.105-r2 970 SHA256 
3f2577f224a8f1594255c32e38aecdf3
 AUX lvm.confd-2.02.28-r2 173 SHA256 
28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844 SHA512 
67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0
 WHIRLPOOL 
06467b28ad2acf36984eef1b7b7e3d88277505760f848a808d85820cd1cccf6bb7397c00624d36961d9bdbb994e55de03444a7cfc97ecefd9bd3b785a3c6fdbf
 AUX lvm.rc-2.02.105-r2 2967 SHA256 
9750556b8d018f959d44f3361c3e7ca79147fce02dec38bd8137b08d8a8df1b1 SHA512 
9c4e1abc85c96148b46d278668225369af5e8d1cb9b47b6de46baae51ffcfbd9c5dee49c285cf936e02ed6fda366ae866a60a2d9023b26842caa485a3bec92d3
 WHIRLPOOL 
5144ab76632702faefffa1bdda968da379b07e9f371874076461b500922bc5bbcfd6895adb7919e2ba4c54c694b3f23c8a92abe4350039ca3d7da7cc7a0a2a4b
 AUX lvm.rc-2.02.116-r4 3778 SHA256 
9f768b7aa564f151241134b8c15f95f31038a3bfc3122b2a9dae25fa82cc053a SHA512 
7ca6e1b25629145fc0bb33b5bf5fedcb30f4e69ae6401222488307d29d86abe3c3cae3c60a2cc4c53082b6fe28027e447ee01bc3ae8c2b3bf811a75678d80b7c
 WHIRLPOOL 
a6672253ebb94bd5b46c1fac3af0f985c765561e075526ead8b00c19907af77ce330c7a981f0d153a2fbe6798bcfb63e27e20a0d4fc18d68c03a9c63e384f5fb
-AUX lvm.rc-2.02.166-r1 3896 SHA256 
b94fd23ee624e5d881f08461768e378e7e30ab5cbe38a94275bdf930f1ecc536 SHA512 
d585b1e0d32c1d2f011f57fcfda8066a99de83a3723f4ddc0d562fb3200ab506582004564f3b203fe9b7d846871088caad8ca49ecf59eb9e3e4bdc1570bd39ca
 WHIRLPOOL 
5326f0697b8b47bf410f2d672d30d814bd772f904c8121462b169c63c6fc8f0aa740c418244b88862859495cbe65cfcc565bb29b1e24c19664071f1bfb66c985
+AUX lvm.rc-2.02.166-r2 4153 SHA256 
3378d46fd17b7a7cdb5aa9aa41bc7b559ba5bda225bcbe7e73d2e2453e403a2b SHA512 
ec3d2aa99aee486b61d6ae4f18fd140c4f61a5c341a2c437e97c5aaf60429e10fe3a5c5d7c1c9be25b2b3652c03f4ed19aa17e9916f585874b9c26829eea370d
 WHIRLPOOL 
e01aafb8abe689ac92b8fd2c23849753cdc70f008432f28e5b929d23c282015dac8de1cb99b1b4d2b2fd1e6fee30b3f311cb31326abdc58afed286f069745869
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 SHA256 
aaf04bdb140cbedebe731a04846cbb7459cdd002ee4616a3d0725136edb5ef02 SHA512 
ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223
 WHIRLPOOL 
9e822f0f1c7c67b5443fb9e62547a1893d8c91f91d63f03c9f4b3d9a20cd24c377f5697f2fe24028f10949550af6f2a05d95db6d5e29700dfaa05f1c3d615773
 AUX lvm2-2.02.108-example.conf.in.patch 1681 SHA256 
c9e0b46965f68c25495e21ca9504699031ed88dbb69407a08d53569ddc88ae4c SHA512 
b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c
 WHIRLPOOL 
0fc73d8e6f47596fa1789118aefebf931fb217342259da838d701bdeb96f21d7de59f29ac81c3c0f4a00db711e86b9fac6b4c889cf05ffc90ad8fd5a9ef77cd1
 AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 SHA256 
5cbdb4c4db1a77767a8cf3a89490eb0e21a2d4cc7729a8ffb099e4d0746e2775 SHA512 
246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041
 WHIRLPOOL 
53e723bdcfe07f668abf6fe9e6093ae38d81b01bd10ade0b40a037d44c367a6945ed86d14d70c2af8af6e7063763fd3620591b5c7384bd255b98cceb7ee192f3
@@ -34,5 +34,5 @@ DIST LVM2.2.02.116.tgz 1538340 SHA256 
2479d6ea61c405efcfcd8a78390d00c1d2e9c92c02
 DIST LVM2.2.02.166.tgz 2148324 SHA256 
e120b066b85b224552efda40204488c5123de068725676fd6e5c8bc655051b94 SHA512 
8bebe9b474f791b5edf5366b0bd24861fbbaf8a83afa2a9e2a8e3917e05e4ecbf6877f018be03ffb4e9b4c8832208264165b85182bf79a07661adf35128b4a21
 WHIRLPOOL 
a4c2e0b2e8da85301b2518b35193304436715fdf45cbc7bc28fd6f7b88af15e611134d5a530d2311b23544aa67c3a7f13fd3780d4d46fc10854e624fb8b27870
 EBUILD lvm2-2.02.116-r4.ebuild 9769 SHA256 
805fd9f6b2a50cdee337df0c17841ad8cbfb783ec584f82ae99d18f4d4bd2cda SHA512 
ff43be372bcfb7fd7a0cf22c85d2c4aaa790d89be56b9718bad0d635fa37fb29646074832b39a3a9f28e5c3f06c334ff9fa37bd128bfc3f67577234f1763615c
 WHIRLPOOL 
b22b87da6833266f929b0972772b573857a92858454974ca588e5cdf6d1e6412b19df49f89b432d022c51f61bf65590ad7802874efcbfd673ac8af78e1aa3f7f
 EBUILD lvm2-2.02.116.ebuild 9403 SHA256 
4cd253d414f2f5a43877a46a29060b49370b7de1fb839b829148d41b452a30ea SHA512 
b4341ff966c615dda3d3a15e63e227b1dea7942bcbf3d3ab3023461b6c059cf9e2149456052c698a0688314cfdb23eb86bad8c4c4e79cc8ed46f23cc7da371c7
 WHIRLPOOL 
bddad07d3066a6e9c50a9f65b4a660bfb3211269e8dab12213f27811badfc74ec51aed6816c098ab7ef8279ba236d27e31b7b629e9428d505a85b2b0015853ab
-EBUILD lvm2-2.02.166-r1.ebuild 9840 SHA256 
dcce0c28e5c9a73107f635123a0e328901cc051751558ccd3016d682b8cf759b SHA512 
c10225d16094d41d1bbee2ff21a939c82747b46962957faa324833252722dca55de8153838eb14a77c43c7f0af7fe7bae729c4d373bab8ac9250d1ff5fbffd87
 WHIRLPOOL 
c1faadf0ce0d9b500a042d5de4e2943b913b6ae80d53bf5e51285cd68ebf97af6ee6c9745b82e820ae02367e44522741b054b4030057dd3a20cad47d07ce8170
+EBUILD lvm2-2.02.166-r2.ebuild 9840 SHA256 
f274c3a719d3b8395810392d09c6d002bf863e7d236d3c7143306542959846c9 SHA512 
0a5fbe9c91ea255d3f23c8dd039fd3d52c67fd93200cdd2915e487d3c2d1bd895aaf30ae8a0e36dd98c517b0095cf08582428f02deebc51de6cd1f68c3b3931f
 WHIRLPOOL 
5528277f3f74dddf634d7774234efd1db513a596fec8d09325db897897fe62eead1aba618110d9ff299fe72b69daf18ba75f5c2c728699c2d0778b57d313f718
 MISC metadata.xml 1397 SHA256 
2b717cd8b25dab45bbf8e04e9d1ea312132ab7d969dbaabcf5ce3665da04dab1 SHA512 
1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
 WHIRLPOOL 
f7d03ebb6752c774d7d0415a0cf1d936e9206e4a923cc9b670d593bbc412baa9a0c96f369fd8be1170642ca8d54ec5165cc1929b88e4267e73ec630ed6b82cde

diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.166-r1 
b/sys-fs/lvm2/files/lvm.rc-2.02.166-r2
similarity index 91%
rename from sys-fs/lvm2/files/lvm.rc-2.02.166-r1
rename to sys-fs/lvm2/files/lvm.rc-2.02.166-r2
index e779d2f..d14292c 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.166-r1
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.166-r2
@@ -18,6 +18,12 @@ _need_lvmetad()
        ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1'
 }
 
+_need_lvmlockd()
+{
+       local lvm_path="$(_get_lvm_path)"
+       [ ! -x "${lvm_path}" ] && return 1
+       ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
+}
 depend() {
        before checkfs fsck
        after modules device-mapper
@@ -33,6 +39,9 @@ depend() {
                if _need_lvmetad; then
                        _need="${_need} lvmetad"
                fi
+               if _need_lvmlockd; then
+                       _need="${_need} lvmlockd"
+               fi
        fi
        need sysfs ${_need}
 }
@@ -77,8 +86,10 @@ start() {
                        lvm_commands="${lvm_commands}vgscan --mknodes\n"
                        # And turn them on!
                        lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
-                       # Start lockd VGs as required
-                       lvm_commands="${lvm_commands}vgchange --lock-start 
--lock-opt auto\n"
+                       if _need_lvmlockd; then
+                               # Start lockd VGs as required
+                               lvm_commands="${lvm_commands}vgchange 
--lock-start --lock-opt auto\n"
+                       fi
                        # Order of this is important, have to work around dash 
and LVM readline
                        printf "%b\n" "${lvm_commands}" | $lvm_path 
/proc/self/fd/0 --config "${config}" >/dev/null
                        eend $? "Failed to setup the LVM"

diff --git a/sys-fs/lvm2/lvm2-2.02.166-r1.ebuild 
b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
similarity index 99%
rename from sys-fs/lvm2/lvm2-2.02.166-r1.ebuild
rename to sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
index f739153..4b4edeb 100644
--- a/sys-fs/lvm2/lvm2-2.02.166-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
@@ -250,7 +250,7 @@ src_install() {
 
        if use !device-mapper-only ; then
                newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-               newinitd "${FILESDIR}"/lvm.rc-2.02.166-r1 lvm
+               newinitd "${FILESDIR}"/lvm.rc-2.02.166-r2 lvm
                newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
 
                newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 
lvm-monitoring

Reply via email to