Bug #354021: update start.sh for LVM2 speedups.

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

5 files changed, 60 insertions, 8 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 90dffc2d4305..03bf5fff1051 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.265 2012/03/27 02:33:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.266 2012/03/27 03:20:56 robbat2 Exp $
+
+  27 Mar 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/lvm2-start.sh-2.02.95, files/lvm2-start.sh-2.02.67-r1,
+  lvm2-2.02.95.ebuild:
+  Bug #354021: update start.sh for LVM2 speedups.
 
 *lvm2-2.02.95 (27 Mar 2012)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index afa75be8f733..3db1c4fc3fe2 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -27,7 +27,8 @@ AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 RMD160 68cd05b35b6190cf77f9ae
 AUX lvm2-2.02.92-locale-muck.patch 570 RMD160 eeb75998a558a7dc1c621cc2f95a0d7ef5eeea53 SHA1 8e9b4f266ebc62041bf0002cc7aa82f328fba841 SHA256 3b24abd3c1254de1727a91b6ade26c36dc8dbee8ecbfab4bf6afbad21fdd59ff
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
 AUX lvm2-start.sh-2.02.49-r3 1244 RMD160 26916bf97b553ee19ebb5bacf2ee754cc5695ea7 SHA1 c5d9fa10089efd28e0dc0fb101ed90f0e6124f0a SHA256 e9c72d8500294301131183b37a7060dbcbd1d01b2a3e8425cf644e07652fae87
-AUX lvm2-start.sh-2.02.67-r1 1255 RMD160 da52e34dfbde91f179acaa9fcdbc7ffe4e9ea5d8 SHA1 47671b4f08ba5a72d06a2fa1bf048616af4e0dd5 SHA256 0351d2fa86fcf5b3b93611d9932dbc6d3fb2bb16210c321334895c51c67f8e91
+AUX lvm2-start.sh-2.02.67-r1 1267 RMD160 9caa0c0ae4ea21ca08e3cb8984f88af270fcc844 SHA1 1a6d24ad2c2dc78bb04898a75f499695852549ff SHA256 48def1f022a337df7cd030c0d1e386d843026814da5494dde5610aa66af94bd2
+AUX lvm2-start.sh-2.02.95 1535 RMD160 6e088fc519e024d6b170f4e2a04402b610789fea SHA1 8b4d61df5e2769796e32e684f40bf153d052ab69 SHA256 46225f0703ac66b8a41b34c74a93060749386be1e8c13e74ec2785cdd38577b4
 AUX lvm2-stop.sh 1939 RMD160 52d1adbf4bdbe6e75e9ff2e91c809b6eed5839d5 SHA1 8ccf316b02fb5f79bb6c0464cc3c1606704cec7b SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c
 AUX lvm2-stop.sh-2.02.49-r3 2253 RMD160 7b00d83fb35125f73349c49af765c1e7409de35a SHA1 e4f61120506e11f4a063ccf10bab2e495194d379 SHA256 dea23f37d232437b15c743ca23af3d7baa95f2b7c71ac1e47ae5289bdcfe0a56
 AUX lvm2-stop.sh-2.02.67-r1 964 RMD160 813e2dbf967c5114ca3eba441815216efd2ebe1e SHA1 ea5568cb54cd1efc0b724830e0d8538cf3c5cfed SHA256 5a208c7ab780404e476afdff349deedad5c57b3feb7e22a07a7075d09c1370e7
@@ -61,6 +62,6 @@ EBUILD lvm2-2.02.88.ebuild 8090 RMD160 91253ec4d9e358ba10345fa8423e53cfcff8a3c1
 EBUILD lvm2-2.02.92.ebuild 8264 RMD160 c372906c947bc9e4e7af6d3aa4171a0bcdf976a9 SHA1 aacd98646d26454759463adf5939c5bd912a926b SHA256 26163b3024b90f3d936ce4376fa42381a0d31e85231b1b615fed61e744abce49
 EBUILD lvm2-2.02.93-r1.ebuild 8279 RMD160 7ba04100a4035b25097626cbcdd12f49080fb425 SHA1 25eff1a536d5d89b7552c28164f297dd79c18b88 SHA256 e037e5f5804eddc1df3d228e3c9c5f761d5491f106cf96cd742c0d1c1d78b167
 EBUILD lvm2-2.02.93.ebuild 8278 RMD160 c1fac06425b62951f276c104c4d0dcb31490acd6 SHA1 53071267503f23946ce007b374a7d91500785782 SHA256 928999e940218606414af49aa36b6f9af87548dff4fb520d6ab3aa7e18a0d730
-EBUILD lvm2-2.02.95.ebuild 8346 RMD160 6c7792a47ca0fbe4b0a71789dff01ce96f105a63 SHA1 cf49be7cfdfc340a7c7728481eb9c02ef2258310 SHA256 91324b26cc35fab744065c5db0e47270bf96dc3c5da3b8d56e760039bc4f6714
-MISC ChangeLog 48456 RMD160 4886e954380f94a318d3fbaf425e649006359538 SHA1 4f158306c0b29cdb736e2c62fd0fe5dabc6e6dbe SHA256 196cf0237d54ef03f5d2aab4a253e4319f59f4e0347c6cea5a3b50a071f213d5
+EBUILD lvm2-2.02.95.ebuild 8343 RMD160 fd05ee75c10be25990fc5978339569af050e6c1c SHA1 212828782b233e4c136665cfce90fb7079e229f9 SHA256 e87fc8b8b4c05f87102acf3ccafcc5c16b31cd5de44f7b5c8248cd2de06ebfca
+MISC ChangeLog 48647 RMD160 5e438db866b1889f56e024ee3d99e22504f1e835 SHA1 6b62b25fb50fb822a597e209bd44b0e4612a1ae4 SHA256 11387a184090a47028e4d6768ea5153e9816189339fcc186aeb6af52c0ef06c4
 MISC metadata.xml 770 RMD160 10cadeecb8b77288ca9ae9dec2b485f5c1a33ba1 SHA1 950857278b8208a02b256f317a6687b446279a8d SHA256 b0994914cb1d6028fd0d0545c4e6d534797d20e7a40eea5d827afa836e0ea1eb
diff --git a/sys-fs/lvm2/files/lvm2-start.sh-2.02.67-r1 b/sys-fs/lvm2/files/lvm2-start.sh-2.02.67-r1
index 65137e2b1062..7cded06142b5 100644
--- a/sys-fs/lvm2/files/lvm2-start.sh-2.02.67-r1
+++ b/sys-fs/lvm2/files/lvm2-start.sh-2.02.67-r1
@@ -1,5 +1,5 @@
 # /lib/rcscripts/addons/lvm-start.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh-2.02.67-r1,v 1.1 2010/06/09 22:41:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh-2.02.67-r1,v 1.2 2012/03/27 03:20:56 robbat2 Exp $
 
 config='global { locking_dir = "/dev/.lvm" }'
 
@@ -39,4 +39,4 @@ if [ -z "${CDBOOT}" -a -x /sbin/vgscan ] ; then
 	fi
 fi
 
-# vim:ts=4
+# vim:ts=4 ft=sh noet:
diff --git a/sys-fs/lvm2/files/lvm2-start.sh-2.02.95 b/sys-fs/lvm2/files/lvm2-start.sh-2.02.95
new file mode 100644
index 000000000000..979ea4742364
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-start.sh-2.02.95
@@ -0,0 +1,46 @@
+# /lib/rcscripts/addons/lvm-start.sh
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh-2.02.95,v 1.1 2012/03/27 03:20:56 robbat2 Exp $
+
+config='global { locking_dir = "/dev/.lvm" }'
+
+dm_in_proc() {
+	local retval=0
+	for x in devices misc ; do
+		grep -qs 'device-mapper' /proc/${x}
+		retval=$((${retval} + $?))
+	done
+	return ${retval}
+}
+
+# LVM support for /usr, /home, /opt ....
+# This should be done *before* checking local
+# volumes, or they never get checked.
+
+# NOTE: Add needed modules for LVM or RAID, etc
+#       to /etc/modules.autoload if needed
+for lvm_path in /bin/lvm /sbin/lvm ; do
+	[ -x "$lvm_path" ] && break
+done
+if [ -z "${CDBOOT}" -a -x "$lvm_path" ] ; then
+	if [ -e /proc/modules ] && ! dm_in_proc ; then
+		modprobe dm-mod 2>/dev/null
+	fi
+	if [ -d /proc/lvm ] || dm_in_proc ; then
+		ebegin "Setting up the Logical Volume Manager"
+		#still echo stderr for debugging
+		lvm_commands="#! ${lvm_path} --config '${config}'\n"
+		# Extra PV find pass because some devices might not have been available until very recently
+		lvm_commands="${lvm_commands}pvscan\n"
+		# Now make the nodes
+		lvm_commands="${lvm_commands}vgscan --mknodes\n"
+		# And turn them on!
+		lvm_commands="${lvm_commands}vgchange --sysinit -a ly\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 to setup the LVM"
+	fi
+else
+	eerror "Cannot find lvm binary in /sbin or /bin!"
+fi
+
+# vim:ts=4 ft=sh noet:
diff --git a/sys-fs/lvm2/lvm2-2.02.95.ebuild b/sys-fs/lvm2/lvm2-2.02.95.ebuild
index 46534979cb16..d8bd6689ccbb 100644
--- a/sys-fs/lvm2/lvm2-2.02.95.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95.ebuild,v 1.1 2012/03/27 02:33:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95.ebuild,v 1.2 2012/03/27 03:20:56 robbat2 Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -192,7 +192,7 @@ src_install() {
 
 	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM 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-start.sh-2.02.95 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