Fix a bug in the udev rules script which was claiming every available block device for device-mapper

(Portage version: 2.1_pre4-r1)

5 files changed, 88 insertions, 11 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index 9a3e2627fca7..f29f0f5d2901 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2006/01/26 21:41:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.10 2006/02/08 14:28:59 dsd Exp $
+
+*multipath-tools-0.4.6.1-r1 (08 Feb 2006)
+
+  08 Feb 2006; Daniel Drake <dsd@gentoo.org>
+  +files/multipath-tools-0.4.6.1-udev-rules.patch,
+  +multipath-tools-0.4.6.1-r1.ebuild:
+  Fix a bug in the udev rules script which was claiming every available block
+  device for device-mapper
 
 *multipath-tools-0.4.6.1 (26 Jan 2006)
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 3096011d4352..5221cde2587b 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 648d28f7b9ba2ad52294df5c687d6205 ChangeLog 1568
 RMD160 83ad12c709ae69e6f7104ca127686c15491db623 ChangeLog 1568
 SHA256 172eec34cf9d1ee03724dda0cd5fa876abeeed69c1806c96f768c7aa76e8df32 ChangeLog 1568
@@ -10,22 +7,24 @@ SHA256 f8c43fec0cb475a0b64396b11fd1c71881a2546996aab31716a4839ad80164c8 files/di
 MD5 d2d722394bcb70bb5b8ea68d41b53d99 files/digest-multipath-tools-0.4.6.1 76
 RMD160 cb93ddf66f66df48dc3e0603410a8f3205489a63 files/digest-multipath-tools-0.4.6.1 76
 SHA256 10a0b202df6795f05faa2ef76c7d710992c22c89b36c75520f30cd0092a6a891 files/digest-multipath-tools-0.4.6.1 76
+MD5 3c87ecbe3c1d31b45aa83798b203a8f2 files/digest-multipath-tools-0.4.6.1-r1 274
+RMD160 f92fb520ee2743dc3cf8c5fb30976aa06984f230 files/digest-multipath-tools-0.4.6.1-r1 274
+SHA256 705d114d3a513522c085ca2fe5716bb91559d4e332538748f8011869a6f87c49 files/digest-multipath-tools-0.4.6.1-r1 274
+MD5 03c2a26ee058b1f021538b1b34fa3d91 files/multipath-tools-0.4.6.1-udev-rules.patch 469
+RMD160 486a10aa8e5f930bfc0ddabf6153d667de978d67 files/multipath-tools-0.4.6.1-udev-rules.patch 469
+SHA256 916a389699324f6bee303febfe105a2e73f6e3c6d9f15f2f0a44c7de06d1bfab files/multipath-tools-0.4.6.1-udev-rules.patch 469
 MD5 7cd2431a33f3bd590b824e48243b53dc files/rc-multipathd 503
 RMD160 dd089ece6f315da56b6f685f0b3c027ed80c09ad files/rc-multipathd 503
 SHA256 53739b9d2e8dc0887594275f6bd58dfbcf6e6df2605afc7a08dc14afe5bc7704 files/rc-multipathd 503
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 616ac09c23d8d7218aad5f409e11956b multipath-tools-0.4.6.1-r1.ebuild 1775
+RMD160 8d78401831c96b64f24507ee87724cf06c67c7c6 multipath-tools-0.4.6.1-r1.ebuild 1775
+SHA256 2cbbaea5bfb7d2d10ebce335b7493d0549d9ecaf36b4d8866abc67f6dd05187a multipath-tools-0.4.6.1-r1.ebuild 1775
 MD5 78f233ca871b17e2d5a08def242bcb09 multipath-tools-0.4.6.1.ebuild 1667
 RMD160 5c6cce2e919042054a25808e940e632ce285ab4b multipath-tools-0.4.6.1.ebuild 1667
 SHA256 cb376a62369032d168f0a29b8eb5b6501ae169be20686bff66bd6608aa643b81 multipath-tools-0.4.6.1.ebuild 1667
 MD5 3c314d91d5daee8226b025e4f4f2bcc6 multipath-tools-0.4.6.ebuild 1682
 RMD160 d5a3964414b7dde908e6df6a3095b18daf26bf6a multipath-tools-0.4.6.ebuild 1682
 SHA256 b873e86e8705ce967506f2e3e4e64a91b7ec99cd8c0e0a944e51ca92d2d9311a multipath-tools-0.4.6.ebuild 1682
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6T+A2+ySkm8kpY0RAmRoAKCCtz5xuULliGo99tsxI2OIGc6ZGQCgvkNk
-kbhLvZWv55yOaqndnTG0V6c=
-=7et+
------END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.6.1-r1 b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.6.1-r1
new file mode 100644
index 000000000000..df8daee1013c
--- /dev/null
+++ b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.6.1-r1
@@ -0,0 +1,3 @@
+MD5 d826dcce21b824d37c2709aeddd288de multipath-tools-0.4.6.1.tar.bz2 138759
+RMD160 ba3dba34ca93d6d4deac7d65faf3ed1c37c082a0 multipath-tools-0.4.6.1.tar.bz2 138759
+SHA256 72bbf5eb7a6cc81ef2fbff04d3f7c873bb2dbaad8b520f3b5df287d6a33898d8 multipath-tools-0.4.6.1.tar.bz2 138759
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.6.1-udev-rules.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.6.1-udev-rules.patch
new file mode 100644
index 000000000000..699a5daf288c
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.6.1-udev-rules.patch
@@ -0,0 +1,10 @@
+--- multipath-tools-0.4.6/multipath/multipath.rules.orig	2006-02-07 18:56:04.000000000 +0000
++++ multipath-tools-0.4.6/multipath/multipath.rules	2006-02-07 18:56:11.000000000 +0000
+@@ -16,7 +16,3 @@ ACTION=="add", SUBSYSTEM=="block", KERNE
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
+ 	RUN+="/sbin/kpartx -a /dev/mapper/%c"
+ 
+-# insert new paths in multipath topology
+-ACTION=="add", SUBSYSTEM=="block", KERNEL!="dm-*", \
+-	RUN+="/sbin/multipath -v0 %r/%k"
+-
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.6.1-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.6.1-r1.ebuild
new file mode 100644
index 000000000000..1be528865207
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.6.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 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.6.1-r1.ebuild,v 1.1 2006/02/08 14:28:59 dsd 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="~x86 ~amd64"
+IUSE=""
+
+RDEPEND=">=sys-fs/device-mapper-1.00.19
+	sys-fs/udev
+	sys-fs/sysfsutils"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:^bindir.*:bindir = /usr/sbin:' multipathd/Makefile
+	sed -i -e 's:rules.d/.*:rules.d/40-multipath.rules:' multipath/Makefile
+
+	# Bug #122016: udev rules file claims every block device
+	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
+
+	# 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
+
+	dodoc AUTHOR COPYING ChangeLog FAQ README TODO
+	docinto dmadm; dodoc README
+	docinto kpartx; dodoc ChangeLog README
+}