Finally fixed udev-rules to have no udev-internal race conditions, bug 171590.

Package-Manager: portage-2.1.3.6

5 files changed, 131 insertions, 10 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index ac97d0513023..00525325afe4 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/multipath-tools
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.13 2006/09/28 08:55:06 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.14 2007/08/22 14:28:00 zzam Exp $
+
+*multipath-tools-0.4.7-r2 (22 Aug 2007)
+
+  22 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/multipath-tools-0.4.7-udev-rules.patch,
+  +multipath-tools-0.4.7-r2.ebuild:
+  Finally fixed udev-rules to have no udev-internal race conditions, bug 171590.
 
 *multipath-tools-0.4.7-r1 (28 Sep 2006)
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 70862acbe425..79da65daf4d8 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -5,6 +5,10 @@ AUX multipath-tools-0.4.7-build.patch 5389 RMD160 aedc8321511402f951a9bf8534f7d8
 MD5 a2e4b84dc88a8269d4f15477c1dcbf22 files/multipath-tools-0.4.7-build.patch 5389
 RMD160 aedc8321511402f951a9bf8534f7d82ec718f7b8 files/multipath-tools-0.4.7-build.patch 5389
 SHA256 f03657968ce0db5b7502f1eba89570a9ec38396939d234aa08972e3906174fe0 files/multipath-tools-0.4.7-build.patch 5389
+AUX multipath-tools-0.4.7-udev-rules.patch 1927 RMD160 3fd2ff93da07a6446fe9cdae6a5097e971a6710b SHA1 da769d174673f7ac136239b2ca71b17f968a893d SHA256 85dedab1da1899f55aa747f141224b6211694dee7a659245981919745f064293
+MD5 3919fd1387c0830794ab25e74ce25af5 files/multipath-tools-0.4.7-udev-rules.patch 1927
+RMD160 3fd2ff93da07a6446fe9cdae6a5097e971a6710b files/multipath-tools-0.4.7-udev-rules.patch 1927
+SHA256 85dedab1da1899f55aa747f141224b6211694dee7a659245981919745f064293 files/multipath-tools-0.4.7-udev-rules.patch 1927
 AUX rc-multipathd 503 RMD160 c68d473e999834959c52d151a3dddc57fd6a397b SHA1 4036691695915f93126dd4a82324dda878d4d54b SHA256 f377a3770fe0d6a4852f77ac7726a72294b18b454c5f40765edb94a0a7496598
 MD5 6749c027c65d8416031561e665506c7a files/rc-multipathd 503
 RMD160 c68d473e999834959c52d151a3dddc57fd6a397b files/rc-multipathd 503
@@ -14,10 +18,14 @@ EBUILD multipath-tools-0.4.7-r1.ebuild 1588 RMD160 a9661a850dc935efb19549c05716a
 MD5 b8cf82c06212d3b0555a62a8896d7cd2 multipath-tools-0.4.7-r1.ebuild 1588
 RMD160 a9661a850dc935efb19549c05716a2913c602b99 multipath-tools-0.4.7-r1.ebuild 1588
 SHA256 ee1e8d69a3f80df481cc440bec59334d9e9408d0e3152da0c569660ad61149fb multipath-tools-0.4.7-r1.ebuild 1588
-MISC ChangeLog 2416 RMD160 c663bf77d21cf67db13232942156145f354f191c SHA1 69c0a8159d52d84e248fe18db9b19aab0616cefc SHA256 470a3f82b0273ecc100b599c3189550f6ef49ec1fa8216e34781a9e144723887
-MD5 45f7f1daa8f1ea01fd8ea980d8450de1 ChangeLog 2416
-RMD160 c663bf77d21cf67db13232942156145f354f191c ChangeLog 2416
-SHA256 470a3f82b0273ecc100b599c3189550f6ef49ec1fa8216e34781a9e144723887 ChangeLog 2416
+EBUILD multipath-tools-0.4.7-r2.ebuild 1633 RMD160 bbe89629a92a9fd7829d8c240cfa6b0266104c75 SHA1 7f84bdc9cd3353d3a2eca022bf20805994705769 SHA256 14188b8b42d33a9ab8aa4bba75f39e5ac1bb8f632a6ad4b5dd6ff70cc87b3c2d
+MD5 2471d3f2fab2f77fc3d1804e835ebc04 multipath-tools-0.4.7-r2.ebuild 1633
+RMD160 bbe89629a92a9fd7829d8c240cfa6b0266104c75 multipath-tools-0.4.7-r2.ebuild 1633
+SHA256 14188b8b42d33a9ab8aa4bba75f39e5ac1bb8f632a6ad4b5dd6ff70cc87b3c2d multipath-tools-0.4.7-r2.ebuild 1633
+MISC ChangeLog 2675 RMD160 869e147179ee0e7152d25e35bb65a17c8e444e3d SHA1 dd7b1ad75393ce6f0c747777439bfe8cb901f36c SHA256 70ce81b16432f3686e8cce54f0738aff6a3bb916bc0d03cb0e028458df0319b4
+MD5 2d3fe4855ea509c8a1549e9b02ea3359 ChangeLog 2675
+RMD160 869e147179ee0e7152d25e35bb65a17c8e444e3d ChangeLog 2675
+SHA256 70ce81b16432f3686e8cce54f0738aff6a3bb916bc0d03cb0e028458df0319b4 ChangeLog 2675
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -25,10 +33,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 89106fb0c6e5705700bdf79e981b3588 files/digest-multipath-tools-0.4.7-r1 268
 RMD160 79e1107d6e6fec7f68eb14a77b08bc78f15cd381 files/digest-multipath-tools-0.4.7-r1 268
 SHA256 76b875dc5cb844d2224dafb9b9389b30c6ca09edf7f7549fb1c8767e25b18a01 files/digest-multipath-tools-0.4.7-r1 268
+MD5 89106fb0c6e5705700bdf79e981b3588 files/digest-multipath-tools-0.4.7-r2 268
+RMD160 79e1107d6e6fec7f68eb14a77b08bc78f15cd381 files/digest-multipath-tools-0.4.7-r2 268
+SHA256 76b875dc5cb844d2224dafb9b9389b30c6ca09edf7f7549fb1c8767e25b18a01 files/digest-multipath-tools-0.4.7-r2 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFFVEsOamhnQswr0vIRAiQ1AKComRd8hpMZiRDgkbfxkJVDKu0dFwCffGi/
-WhGhZnKAa+a9RLgAXwxIPHI=
-=7/Ag
+iD8DBQFGzEf2t2vP6XvVdOcRAgQuAJ4uYvUfg30KTwztEUJTn6tls6fZ1QCfU7/M
+MvqMvnVhFkf6Si6NuOTIS1U=
+=YVOs
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.7-r2 b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.7-r2
new file mode 100644
index 000000000000..57225a5b6b98
--- /dev/null
+++ b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.7-r2
@@ -0,0 +1,3 @@
+MD5 0a7574f0dd85f2b50f6aff91d83633ad multipath-tools-0.4.7.tar.bz2 139312
+RMD160 b9ecd84e01e03fe631e9ee9953ea7dbadb04c01d multipath-tools-0.4.7.tar.bz2 139312
+SHA256 1b48684c9ce956bb2294640a92f1da8ddea4e991e4d7b974697660de5e44a9d7 multipath-tools-0.4.7.tar.bz2 139312
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.7-udev-rules.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.7-udev-rules.patch
new file mode 100644
index 000000000000..6bd6300ccb93
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.7-udev-rules.patch
@@ -0,0 +1,44 @@
+diff -ru multipath-tools-0.4.7-orig/multipath/Makefile multipath-tools-0.4.7/multipath/Makefile
+--- multipath-tools-0.4.7-orig/multipath/Makefile	2007-08-22 16:19:00.877039944 +0200
++++ multipath-tools-0.4.7/multipath/Makefile	2007-08-22 16:20:00.382334855 +0200
+@@ -39,12 +39,12 @@
+ 	install -d $(DESTDIR)$(bindir)
+ 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ 	install -d $(DESTDIR)/etc/udev/rules.d
+-	install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
++	install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
+ 	install -d $(DESTDIR)$(mandir)
+ 	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+ uninstall:
+-	rm $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
++	rm $(DESTDIR)/etc/udev/rules.d/64-multipath.rules
+ 	rm $(DESTDIR)$(bindir)/$(EXEC)
+ 	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
+ 
+diff -ru multipath-tools-0.4.7-orig/multipath/multipath.rules multipath-tools-0.4.7/multipath/multipath.rules
+--- multipath-tools-0.4.7-orig/multipath/multipath.rules	2007-08-22 16:19:22.878997659 +0200
++++ multipath-tools-0.4.7/multipath/multipath.rules	2007-08-22 16:21:02.887896761 +0200
+@@ -1,18 +1,13 @@
++# do not edit this file, it will be overwritten on update
+ #
+ # multipath and multipath partitions nodes are created in /dev/mapper/
+ # this file should be installed in /etc/udev/rules.d
+ #
+-# !! udev must not discard DM events !!
+-# !! check the other installed rules !!
+-#
+ 
+-# lookup the devmap name
+-#ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+-#	PROGRAM="/sbin/devmap_name %M %m"
+-ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+-	PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info"
++# DM_NAME is set in 64-device-mapper.rules
+ 
+ # take care of devmap partitioning
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+-	RUN+="/sbin/kpartx -a /dev/mapper/%c"
++	ENV{DM_NAME}=="?*", \
++	RUN+="/sbin/kpartx -a /dev/mapper/$env{DM_NAME}"
+ 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild
new file mode 100644
index 000000000000..084e1d407cc7
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild,v 1.1 2007/08/22 14:28:00 zzam Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/wiki/wakka.php?wiki=Home"
+SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-fs/device-mapper-1.00.19-r1
+	sys-fs/udev
+	sys-fs/sysfsutils"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-udev-rules.patch
+}
+
+src_compile() {
+	emake -j1 CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man8
+	make DESTDIR="${D}" install || die "install failed"
+
+	insinto /etc
+	newins "${S}"/multipath.conf.annotated multipath.conf
+	fperms 644 /etc/udev/rules.d/40-multipath.rules
+	newinitd "${FILESDIR}"/rc-multipathd multipathd
+
+	dodoc AUTHOR ChangeLog FAQ README TODO
+	docinto dmadm; dodoc README
+	docinto kpartx; dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# The dev.d script was previously wrong and is now removed (the udev rules
+	# file does the job instead), but it won't be removed from live systems due
+	# to cfgprotect.
+	# This should help out a little...
+	if [[ -e ${ROOT}/etc/dev.d/block/multipath.dev ]] ; then
+		mkdir -p "${D}"/etc/dev.d/block
+		echo "# Please delete this file. It is obsoleted by /etc/udev/rules.d/40-multipath.rules" \
+			> "${D}"/etc/dev.d/block/multipath.dev
+	fi
+}