Add udev rules per bug #182960. Add support for partitioned md devices per #123380. Rip out the old raidtools support since raidtools is long gone.

Package-Manager: portage-2.1.3.11

7 files changed, 178 insertions, 15 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 3445038183b3..8da1c7dadc4c 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.81 2007/10/02 22:02:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.82 2007/10/03 11:58:45 robbat2 Exp $
+
+*mdadm-2.6.3-r2 (03 Oct 2007)
+
+  03 Oct 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/64-md-raid.rules-2.6.3-r2, +files/raid-start.sh-2.6.3-r2,
+  +files/raid-stop.sh-2.6.3-r2, +mdadm-2.6.3-r2.ebuild:
+  Add udev rules per bug #182960. Add support for partitioned md devices per
+  #123380. Rip out the old raidtools support since raidtools is long gone.
+  Also make the addon scripts be /bin/sh compatible now.
 
 *mdadm-2.6.3-r1 (02 Oct 2007)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 0cd121252a18..ce10ca856c4a 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 64-md-raid.rules-2.6.3-r2 738 RMD160 95f8934aded76f5b85e5f2ff9f9f250f8c4a4300 SHA1 4c4a103fd8ed7134f8b86b1f7d2f4f6cf439184e SHA256 9ad68b9efc5bf7785c1a5cc4b49568f54b25ad0b9783a7642e60a131ef238f3b
+MD5 8b8c842143cd257e0492e10949111e0c files/64-md-raid.rules-2.6.3-r2 738
+RMD160 95f8934aded76f5b85e5f2ff9f9f250f8c4a4300 files/64-md-raid.rules-2.6.3-r2 738
+SHA256 9ad68b9efc5bf7785c1a5cc4b49568f54b25ad0b9783a7642e60a131ef238f3b files/64-md-raid.rules-2.6.3-r2 738
 AUX mdadm-1.9.0-dont-make-man.patch 260 RMD160 439a95518c7890bf72ef463ec274c53437f4ac5e SHA1 b40ab96938d0a0d80a25d67fc263c94c76749269 SHA256 71c81dbbfa1d466e9ee2d3ff0afa8b2d57e75be5dbccdbdd837786723943f7cd
 MD5 c0f39d9acef8dee3159359691bf76b94 files/mdadm-1.9.0-dont-make-man.patch 260
 RMD160 439a95518c7890bf72ef463ec274c53437f4ac5e files/mdadm-1.9.0-dont-make-man.patch 260
@@ -25,10 +26,18 @@ AUX raid-start.sh 1606 RMD160 8adf7b5a60bb3b7e69fcd317b7866072acb9c3c9 SHA1 03da
 MD5 49f82cf9a0a1343b71400a2d2d4706af files/raid-start.sh 1606
 RMD160 8adf7b5a60bb3b7e69fcd317b7866072acb9c3c9 files/raid-start.sh 1606
 SHA256 bd6923697c571e29cbbbba7f36a71993f7af30579e1ee176303c3ced39ff16f6 files/raid-start.sh 1606
+AUX raid-start.sh-2.6.3-r2 1510 RMD160 a4b717beca02df3ea17a4257b34933c1f6f9a1a6 SHA1 2eabe12927f434219820860021bd51e87a3f1933 SHA256 c05603b77c94d4d340d7cfc4a66d91f5ce36b3489196daad748d3e4ecbc85d37
+MD5 31a2de90170e396ddb73f1bedd0c71cd files/raid-start.sh-2.6.3-r2 1510
+RMD160 a4b717beca02df3ea17a4257b34933c1f6f9a1a6 files/raid-start.sh-2.6.3-r2 1510
+SHA256 c05603b77c94d4d340d7cfc4a66d91f5ce36b3489196daad748d3e4ecbc85d37 files/raid-start.sh-2.6.3-r2 1510
 AUX raid-stop.sh 895 RMD160 ffffe626fd7e6251e34686a96e831f1bb4075884 SHA1 386e8317a7b2285264fb30137694a9c90e980754 SHA256 d785f81e30cda8d0eb78ac503520284c85c96de0f44e44f69a32a8d2d1e4af1c
 MD5 4793678d1a98a8491a32abcfbaa890a2 files/raid-stop.sh 895
 RMD160 ffffe626fd7e6251e34686a96e831f1bb4075884 files/raid-stop.sh 895
 SHA256 d785f81e30cda8d0eb78ac503520284c85c96de0f44e44f69a32a8d2d1e4af1c files/raid-stop.sh 895
+AUX raid-stop.sh-2.6.3-r2 655 RMD160 4510677c8f6efc3d7ab4fb76e50da38f67e6f3b2 SHA1 5f598576c13be9eb16afeba3c980d822293d5b1a SHA256 5548ff921f980918323cf86060c0b3360522a034b020edd7dd4aa8df60976366
+MD5 cf87b798422eaf598791a570b077a16b files/raid-stop.sh-2.6.3-r2 655
+RMD160 4510677c8f6efc3d7ab4fb76e50da38f67e6f3b2 files/raid-stop.sh-2.6.3-r2 655
+SHA256 5548ff921f980918323cf86060c0b3360522a034b020edd7dd4aa8df60976366 files/raid-stop.sh-2.6.3-r2 655
 DIST mdadm-2.6.2.tar.bz2 151082 RMD160 04f7598019b28dadcb7ca35c630910e65a036cdf SHA1 623d5462c41fac7b95e641a8bb8587c933d025d9 SHA256 b026731babd23013277d7a0e087d2233ff044deb616c51851dc3adffaae32a55
 DIST mdadm-2.6.3.tar.bz2 151822 RMD160 236f38c021d92e387cf00f66a28d1a35d160740b SHA1 b4c40340efc70b7d79a4cca1471e23661f903111 SHA256 5da1da7e2e9df39071016e6914769f685574dc50d94b6b2bbfaec18e376c070c
 EBUILD mdadm-2.6.2.ebuild 1242 RMD160 42a33cf93b617f96afa76a5719381f6d19218acb SHA1 1714ed9eaade4ade9653b535c34eb55e9766dc9a SHA256 863f2968c780c1dfed442e6e6efd47285d1d4cd245585202be5689a077c629a1
@@ -39,14 +48,18 @@ EBUILD mdadm-2.6.3-r1.ebuild 1626 RMD160 c990da75b65f60c9d1252c0cc0dab9b2bd12206
 MD5 0aa51808a7fad68def21dc97b870161a mdadm-2.6.3-r1.ebuild 1626
 RMD160 c990da75b65f60c9d1252c0cc0dab9b2bd122069 mdadm-2.6.3-r1.ebuild 1626
 SHA256 7016b7bbc33260d8735ab8447074d65a2f5fe9a921bd8951047d4a4a11dfde8d mdadm-2.6.3-r1.ebuild 1626
+EBUILD mdadm-2.6.3-r2.ebuild 1825 RMD160 1ce7f964db58023f28d0ea98683c8a2b9e61c3ca SHA1 e4ce801ac4dfa0ebdf720e5777e40dcddbc53b26 SHA256 8fcc39d6462678a81b3bd682b7832bd7202120a676760291ffe79c3d358b3b55
+MD5 1e1a3a3ea94951ad3d4ef76d18dcd3c4 mdadm-2.6.3-r2.ebuild 1825
+RMD160 1ce7f964db58023f28d0ea98683c8a2b9e61c3ca mdadm-2.6.3-r2.ebuild 1825
+SHA256 8fcc39d6462678a81b3bd682b7832bd7202120a676760291ffe79c3d358b3b55 mdadm-2.6.3-r2.ebuild 1825
 EBUILD mdadm-2.6.3.ebuild 1247 RMD160 f53ae47db3ee0540384c848adf1828127372f71f SHA1 ffab0c6351454cef193582f598a977a37661a2e4 SHA256 460b31566602f886f18593598edd0a11278caaba12aa069a7b6dc515981026d8
 MD5 7a85f7cdee9603e4369511f1a51a719c mdadm-2.6.3.ebuild 1247
 RMD160 f53ae47db3ee0540384c848adf1828127372f71f mdadm-2.6.3.ebuild 1247
 SHA256 460b31566602f886f18593598edd0a11278caaba12aa069a7b6dc515981026d8 mdadm-2.6.3.ebuild 1247
-MISC ChangeLog 12765 RMD160 d59e63b35e972b56f54397b2139b914f9ff2fd72 SHA1 1ef993969a45a356bb447122143692bd3395cf72 SHA256 5a0ffcbdae783f1f055fc9b965456d925834cf47ce3e3af69eba23a3cd3b323c
-MD5 a88c67980c99f70d3c4cdd796f385c70 ChangeLog 12765
-RMD160 d59e63b35e972b56f54397b2139b914f9ff2fd72 ChangeLog 12765
-SHA256 5a0ffcbdae783f1f055fc9b965456d925834cf47ce3e3af69eba23a3cd3b323c ChangeLog 12765
+MISC ChangeLog 13183 RMD160 94361f3b7ffbfad323608daebe40e04d0c465f3f SHA1 8f71d347c39a758f31c1571a476a4bbda8734d51 SHA256 125bd04e524c8812ef647b2abbee4340a9dbf8e6115335f71904b05954abc490
+MD5 0bb11e005e4b5274db4026a20ab95dbb ChangeLog 13183
+RMD160 94361f3b7ffbfad323608daebe40e04d0c465f3f ChangeLog 13183
+SHA256 125bd04e524c8812ef647b2abbee4340a9dbf8e6115335f71904b05954abc490 ChangeLog 13183
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -60,10 +73,6 @@ SHA256 a6eaa12879f5f167738448a0be8ff5251c8c44113546fcbcb196fb2b34cd1a22 files/di
 MD5 64ca76f35ba4abc60fb0f6da895b5e94 files/digest-mdadm-2.6.3-r1 238
 RMD160 5ae321c8144c93becbc4fba6248b4fe1f7a04302 files/digest-mdadm-2.6.3-r1 238
 SHA256 a6eaa12879f5f167738448a0be8ff5251c8c44113546fcbcb196fb2b34cd1a22 files/digest-mdadm-2.6.3-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHAr/3oeSe8B0zEfwRAgt0AJ91oowr+410+F2jY08SWhRlVyEZWgCfSqDT
-X0RFTe3UgfP12z+MTuWFuTE=
-=vXD1
------END PGP SIGNATURE-----
+MD5 64ca76f35ba4abc60fb0f6da895b5e94 files/digest-mdadm-2.6.3-r2 238
+RMD160 5ae321c8144c93becbc4fba6248b4fe1f7a04302 files/digest-mdadm-2.6.3-r2 238
+SHA256 a6eaa12879f5f167738448a0be8ff5251c8c44113546fcbcb196fb2b34cd1a22 files/digest-mdadm-2.6.3-r2 238
diff --git a/sys-fs/mdadm/files/64-md-raid.rules-2.6.3-r2 b/sys-fs/mdadm/files/64-md-raid.rules-2.6.3-r2
new file mode 100644
index 000000000000..6bbfd126dffd
--- /dev/null
+++ b/sys-fs/mdadm/files/64-md-raid.rules-2.6.3-r2
@@ -0,0 +1,18 @@
+# md links hook into "change" events, when the array becomes available
+
+SUBSYSTEM!="block", GOTO="md_end"
+KERNEL!="md[0-9]*", GOTO="md_end"
+ACTION!="add|change", GOTO="md_end"
+
+ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
+
+IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
+ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}"
+ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
+
+IMPORT{program}="vol_id --export $tempnode"
+OPTIONS="link_priority=100"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+LABEL="md_end"
diff --git a/sys-fs/mdadm/files/digest-mdadm-2.6.3-r2 b/sys-fs/mdadm/files/digest-mdadm-2.6.3-r2
new file mode 100644
index 000000000000..53e49f8e561a
--- /dev/null
+++ b/sys-fs/mdadm/files/digest-mdadm-2.6.3-r2
@@ -0,0 +1,3 @@
+MD5 2d3950028253a856f065763e5bd78b1c mdadm-2.6.3.tar.bz2 151822
+RMD160 236f38c021d92e387cf00f66a28d1a35d160740b mdadm-2.6.3.tar.bz2 151822
+SHA256 5da1da7e2e9df39071016e6914769f685574dc50d94b6b2bbfaec18e376c070c mdadm-2.6.3.tar.bz2 151822
diff --git a/sys-fs/mdadm/files/raid-start.sh-2.6.3-r2 b/sys-fs/mdadm/files/raid-start.sh-2.6.3-r2
new file mode 100644
index 000000000000..0f8060df93b8
--- /dev/null
+++ b/sys-fs/mdadm/files/raid-start.sh-2.6.3-r2
@@ -0,0 +1,51 @@
+# /lib/rcscripts/addons/raid-start.sh:  Setup raid volumes at boot
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-start.sh-2.6.3-r2,v 1.1 2007/10/03 11:58:45 robbat2 Exp $
+
+[ -f /proc/mdstat ] || exit 0
+
+# We could make this dynamic, but eh
+#[ -z ${MAJOR} ] && export MAJOR=$(awk '$2 == "md" { print $1 }' /proc/devices)
+MAJOR=9
+
+# Try to make sure the devices exist before we use them
+create_devs() {
+	local node dir minor
+	for node in $@ ; do
+		[ "${node#/dev}" != "${node}" ] && node="/dev/${node}"
+		[ -e "${node}" ] && continue
+
+		dir="${node%/*}"
+		[ ! -d "${dir}" ] && mkdir -p "${dir}"
+
+		minor="${node##*/}"
+		mknod "${node}" b ${MAJOR} "${minor##*md}" &> /dev/null
+	done
+}
+
+# Start software raid with mdadm (new school)
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[ -e /etc/mdadm.conf ] && mdadm_conf="/etc/mdadm.conf"
+if [ -x /sbin/mdadm -a -f "${mdadm_conf}" ] ; then
+	devs="$(awk '/^[[:space:]]*ARRAY/ { print $2 }' ${mdadm_conf})"
+	if [ -n "${devs}" ]; then
+		create_devs ${devs}
+		ebegin "Starting up RAID devices (mdadm)"
+		output=$(mdadm -As 2>&1)
+		ret=$?
+		[ ${ret} -ne 0 ] && echo "${output}"
+		eend ${ret}
+	fi
+fi
+
+partitioned_devs="$(find /dev -maxdepth 1 -name 'md_d*')"
+if [ -n "${partitioned_devs}" ]; then
+	ebegin "Creating RAID device partitions"
+	/sbin/blockdev ${partitioned_devs}
+	eend 0
+	# wait because vgscan runs next, and we want udev to fire
+	sleep 1
+fi
+
+# vim:ts=4
diff --git a/sys-fs/mdadm/files/raid-stop.sh-2.6.3-r2 b/sys-fs/mdadm/files/raid-stop.sh-2.6.3-r2
new file mode 100644
index 000000000000..b76e56ac4e29
--- /dev/null
+++ b/sys-fs/mdadm/files/raid-stop.sh-2.6.3-r2
@@ -0,0 +1,19 @@
+# /lib/rcscripts/addons/raid-stop.sh:  Stop raid volumes at shutdown
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-stop.sh-2.6.3-r2,v 1.1 2007/10/03 11:58:45 robbat2 Exp $
+
+[ -f /proc/mdstat ] || exit 0
+
+# Stop software raid with mdadm (new school)
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[ -e /etc/mdadm.conf ] && mdadm_conf="/etc/mdadm.conf"
+if [ -x /sbin/mdadm -a -f "${mdadm_conf}" ] ; then
+	ebegin "Shutting down RAID devices (mdadm)"
+	output=$(mdadm -Ss 2>&1)
+	ret=$?
+	[ ${ret} -ne 0 ] && echo "${output}"
+	eend ${ret}
+fi
+
+# vim:ts=4
diff --git a/sys-fs/mdadm/mdadm-2.6.3-r2.ebuild b/sys-fs/mdadm/mdadm-2.6.3-r2.ebuild
new file mode 100644
index 000000000000..049e684d0bb0
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.6.3-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.3-r2.ebuild,v 1.1 2007/10/03 11:58:45 robbat2 Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/mdadm"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CROSS_COMPILE=${CHOST}- \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh-2.6.3-r2 raid-start.sh || die "addon failed"
+	newexe "${FILESDIR}"/raid-stop.sh-2.6.3-r2 raid-stop.sh || die "addon failed"
+	dodoc INSTALL TODO "ANNOUNCE-${PV}"
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die "installing mdadm.rc failed"
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die "installing mdadm.confd failed"
+	newinitd "${FILESDIR}"/mdraid.rc mdraid || die "installing mdraid.rc failed"
+	
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-md-raid.rules-2.6.3-r2 64-md-raid.rules || die
+}
+
+pkg_postinst() {
+	elog "If using baselayout-2 and not relying on kernel auto-detect"
+	elog "of your RAID devices, you need to add 'mdraid' to your 'boot'"
+	elog "runlevel. Run the following command:"
+	elog "rc-update add mdraid boot"
+}