Bug #334125: Ignore an error shutting down last LVs, if they are /usr or / we will not be able to shut them down as we are running from them.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 11 insertions, 6 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index c8d5ddb0e365..1b9f9f3bd7c5 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.335 2014/02/02 05:52:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.336 2014/02/02 05:56:20 robbat2 Exp $
+
+  02 Feb 2014; Robin H. Johnson <robbat2@gentoo.org> files/lvm.rc-2.02.105:
+  Bug #334125: Ignore an error shutting down last LVs, if they are /usr or / we
+  will not be able to shut them down as we are running from them.
 
 *lvm2-2.02.105 (02 Feb 2014)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index b41a60fc7adf..134b108c4ac5 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -7,7 +7,7 @@ AUX dmtab 416 SHA256 e2e22bbe13fb97ec9a68659daa275b1d22fd0a3fd21e76b1f4bfba504a8
 AUX lvm-monitoring.initd-2.02.67-r2 1183 SHA256 b89971a4f163e1a91df2416ff442cae7209f8343e6c8612eb3174ed8f5c5c788 SHA512 e99d8e0ed2f22e8f3f1e36581ce92bc2196dbebdeb7c301070c5f2e78079804de3ac782c732929e23a3a01536a270236513c849ec1574ff4c72045b8f69c98ed WHIRLPOOL 71eb7d1203bc2b6be22ebb0eb20e3d2e0786036bea9f0beda91c517f47b99374b52ca4c7d5cd76ae6338ddab187b68a7a371a437e5501996454e125e12e998a8
 AUX lvm.conf-2.02.67.patch 1676 SHA256 0d36c4de0503739d822b3103a62dc0110febc3c56cd25d04443b30f54da6d0cb SHA512 59cb4a4625a7a18ec81b10f4b70a1632cf608d30b1fd827cc7a97692ab3cbbe2e0108001952f5002f1ffe6b354be7b96430e5ce86ed183885afdd1b5f0aa76e4 WHIRLPOOL 71c42b80f390de73b116dbe4808b44559196175465126393128b87826248ac5a34d79c4f64647d6b4541288ae4d25669168120ce8889deb08bfb7919dde249ed
 AUX lvm.confd-2.02.28-r2 173 SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844 SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0 WHIRLPOOL 06467b28ad2acf36984eef1b7b7e3d88277505760f848a808d85820cd1cccf6bb7397c00624d36961d9bdbb994e55de03444a7cfc97ecefd9bd3b785a3c6fdbf
-AUX lvm.rc-2.02.105 3002 SHA256 2f6f220f9c49c3f4ad0a528586e45e94e93e885f38588dd1b8b2e45314b32da4 SHA512 981773ee8076e72828259df283ec06204b60fea3adc119584da9ae8d03370b133f4dfad3e413d2ad43193021e1fff0560126ec99fbc40c3f3fc28231d7bdf33a WHIRLPOOL 2a0505b7380b839390f01fdd9508abe4429620a1b28ab216a70105b41330009bd7fd1fe113547833ea7340fae1d8b7a4f651b00a3e9fa54bbbeba4df65999e18
+AUX lvm.rc-2.02.105 3062 SHA256 3c1a868b766e1a8e4fa19a9ef63d664fae039752c174bca49fa9b23cd82fe11c SHA512 7df015e554c55caff38e41b364eb810991e57b70f8d7967a4675bc46f71d162fcc9657bea46211a08df411a526e73647d43ee46c96bb409008fb9cf45619ecd7 WHIRLPOOL f27a40987101c0043fc030f0e6354531c8057486f789c519fd6c3e3ee24a0a74640630245171f970f09b041e2c30845729b3d54196eda973d1f7f78c23556041
 AUX lvm.rc-2.02.95-r2 3001 SHA256 66844a70cedf61b2cd3373cdbd8f8c1afa817bde0764fdf5cf488857532d4553 SHA512 e5d34447db2fc050256222eff427703341b839a80c833c8ca2a814663b790bdffad967fa41bda8c182d5217dda629057a571520cb0a2e4cb06d5a8a241746ea3 WHIRLPOOL 102baf82bd5573ce90bdb19307ccf71026b6e03fd9e471a123f17072e0ac3785ecf017bb2cd81adf7a5332f33b42330e7c484c8804ed57d4ad6fb1cdd4c119f7
 AUX lvm2-2.02.100-selinux_and_udev_static.patch 3223 SHA256 15c20b1e16443932c560164ad9546ab01279601b0f0dd7fdc54f9cf3cd3ffee3 SHA512 232dc2908073254e23878098734cc65449c7be0707f7f0f7e73561e7b204bf71cf75ff5ee143b0f9f301ddabac1595c59cb0ec80c665464e8fe3f1b65a3eb0c2 WHIRLPOOL fdd908aa01cc3790be4ff8e7b2180cd526065c826657924edfccdc53f5c2266a12911c1ebface9de649b1974ff77401e94a64de507b5c72415614e5726dd4a2a
 AUX lvm2-2.02.105-pthread-pkgconfig.patch 444 SHA256 44e088b638019515cfe58577f4e387e6eb053e44ef4465bf2a451186f38ff7ac SHA512 aea6b2c9ed3705211674c89fac32953612e90c957c632eafe9741d5ec24821a8e94960c3c93fa4e017f622bc174bbb83a4330c4aaa4ba57ebd2bbfb081342bcb WHIRLPOOL 9ed33e26ba3197d02f98dbb586e949439b0b074638e269485ca9a972133603c5be3b707dadcb95db838090ed8c092d3949ae6d8fed8a04dcf5f0f729fb864b1c
@@ -34,5 +34,5 @@ EBUILD lvm2-2.02.103.ebuild 7426 SHA256 4aff8a96065d99c529b1a5cb30fb4e6fcdda9569
 EBUILD lvm2-2.02.104.ebuild 7443 SHA256 49f94841de1fd4a2c8b5275de5d317ea67cb285e8cc89758da8525f869dc0270 SHA512 542035e3dc3117794c2a8e2270f1360cff8aa7edec3c7ad7b51b14535f632b41d3c53f0c214e48bcc000e8946f8a805b8aa4d8b32bcf1abdae3f4223424fa0d9 WHIRLPOOL b17ed1883571c4d794e71a834a3a7105c2d97b32087e4bf5acc2d33be27fd8e1df6f75d50b3a0c064af4c4958f1cb0ff9eecbacd3b1ea7816dd87e0013379988
 EBUILD lvm2-2.02.105.ebuild 7686 SHA256 a5f79ffbdb0b7962e150b0eda74cc596b5dc58c29d9fd713d49a12fa29c8771b SHA512 eb88e49c64e9b368eb85a94c809911bde59b632818e4af32c36b63b30b376b90d8284679a67fc742b4ef685aad20f29976ae6339abff9deef6569bfae66c2929 WHIRLPOOL 21d65f7f4e580951ea27516aaf41d1e6b470b3aba350ef9cdea2060257786446310141268e4d81dc8d66fffb853d23cf625d087b5b27a7a8c9d84d5d22886105
 EBUILD lvm2-2.02.97-r1.ebuild 9072 SHA256 616ff463fda707204c5e92c3a22651ec3e87168ead21b859f6ad0f00c2775960 SHA512 d395b0dc1a18846f76bc79f7fef2cbb649bbee179ea800d6b82398ff113d21c84d987107d14397986d2dc7f5127345cde7e1c588ddfcab339e016f3133dc6080 WHIRLPOOL f14c3e31b83d73b4e996e47c1db7e79e293881dfb1bc519383cfdaac35331ff4fb0a735d2c138433855b1795f084552126b340624191ba8aaf0069011eb6d823
-MISC ChangeLog 64118 SHA256 c63ceb76bf7032c543af5503c528632b44685280a5b135be63008a1a0b8a40fb SHA512 4935efb609ffd0d60e3812a7bf5e718f04174092465c4dcc654cc042df16510252b00dfb5f84e576a3d789744a260d74e2ec11b2dba54a79f13b38e41f8859bc WHIRLPOOL 14c3b6f253262e6cef4198a5e6e3c941872922a8c17b8d73db7fd4a63086a6de4ab79c303019be80975587a0d182889085ab6fb5b6eb019fb956b8427fbd9e71
+MISC ChangeLog 64341 SHA256 6aeba0df5977295696390c37f754a5a6ae0067e3752edc9debf4425d0aa79e32 SHA512 736bb3075bf24773b17b759f096096c3aabb420b04a32727cf20551742136f5e502413e95677855fff098ed42a0b6ffc07b4ebca07195c00d3729d562f958da9 WHIRLPOOL 3e6f51b0e368239aad719296f437af8940fcc30b4fa3c8b3c315d03abeee1bc0ed40c0abdd6d24431b445a456664fb8a922b6ac463ff9b8ba1e6b7255643f79f
 MISC metadata.xml 890 SHA256 939c094b59b429047563482baaa129a54f2328257fc19a0b646c443b77bab434 SHA512 9c676f0c9bf91e5fa82c7ae85c4cd2556f6eee5c6fcb8eeaa8465ba6737fb2c9379412871de2334c3152897f054fcbfab39c4229b9fbaf14345c38b90301fe12 WHIRLPOOL a75625cf26cddb09c24e351a492a2ad7bf357171f19012b62b482971eacd23ef1a069ea3d0ad7b687a7ec77d662bc758dc002e02ff725afe3bb1ab32c07d3a1e
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105 b/sys-fs/lvm2/files/lvm.rc-2.02.105
index 732c513db65c..fb0d949aa3a3 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.105
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.105
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105,v 1.1 2014/02/02 05:52:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105,v 1.2 2014/02/02 05:56:20 robbat2 Exp $
 
 depend() {
 	before checkfs fsck
@@ -86,10 +86,11 @@ then
 			lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n"
 			# 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"
+			eend $? "Failed (possibly some LVs still needed for /usr or root)"
         fi
 
-	einfo "Finished Shutting down the Logical Volume Manager"
+	einfo "Finished shutting down the Logical Volume Manager"
+	return 0
 fi
 }