Bug #278305: Newer udev rules for vol_id removal.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 108 insertions, 2 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 0c3e30b96737..5db0445de29c 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.110 2009/03/20 22:50:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.111 2009/07/29 19:14:32 robbat2 Exp $
+
+*mdadm-2.6.9-r1 (29 Jul 2009)
+
+  29 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> +mdadm-2.6.9-r1.ebuild,
+  +files/udev-145-64-md-raid.rules:
+  Bug #278305: Newer udev rules for vol_id removal.
 
 *mdadm-2.6.9 (20 Mar 2009)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index dd9446223e4f..76eeb762aa1e 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -10,6 +10,7 @@ AUX raid-start.sh 1445 RMD160 6c210b05103376ea0e6d9c251ef8cc3b7b74957f SHA1 dda9
 AUX raid-start.sh-2.6.4 1470 RMD160 c779e6f5ff5fb74c46c8d590a87bc07d97f21943 SHA1 4cd319c799b2ff9c186b89d16a80da64506e7b02 SHA256 f9a65d5947053bc7c6930f2b011b7e4b3a37f1f390beac7a72f0ac3a54d0d174
 AUX raid-stop.sh 645 RMD160 a2855fbdad1222044a9de5b7a9f441592d42960b SHA1 daa2052a3835ca178005a96a3675759a96119203 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db
 AUX udev-141-64-md-raid.rules 1900 RMD160 235513a92557c2fac5410cb82a031652b56995f0 SHA1 c3a634df2d9f6c3c6e16d86872a8f434588f00c9 SHA256 3a594a85278e66eb1045a5e9b10f5621839567c4097ecff3fefb2a2416983b8b
+AUX udev-145-64-md-raid.rules 1907 RMD160 62709980a4fc8fe9f93ef5b9de4aef553cc0ab0a SHA1 d6fc83ef160d1bc51c2a4ca6cba0301eb8d0c097 SHA256 5f4061246afda40a151c1c2b9f9e4cbf9d87b8d92f67db3792c92a86ba0274f0
 DIST mdadm-2.6.4.tar.bz2 152401 RMD160 dcd17d2f4c42061de44c27f3bf80cf5fee6aaab3 SHA1 efcd1ef9a5fc5fbce30d03d371cbd6997a4e2c40 SHA256 1d39f110eda550b9e7dbe9d1e56098ef77197029cb8c5f5d638d2c255feaf23d
 DIST mdadm-2.6.7.1.tar.bz2 154158 RMD160 ed6a7c58fc025636a3a54cf1287fd1d0551735e5 SHA1 217d49fd00152ffd841962a5ae3059040c648c55 SHA256 179e305240cacb6c9ca679773b7fbd03625f813d9fb251111ea802f72f7f9222
 DIST mdadm-2.6.7.tar.bz2 153982 RMD160 050ad044392a804e3a08282de10e56eb2411f15e SHA1 6b9ac8e7e9b7f60cc2d709883028221be8a949d9 SHA256 f2ec116bb1fc0102861796bc56777e751ea65202b460b0d43ae6ad277def807e
@@ -21,6 +22,7 @@ EBUILD mdadm-2.6.4-r3.ebuild 1919 RMD160 510abe2d735bef32d8891e4ed87637277e22e61
 EBUILD mdadm-2.6.7.1.ebuild 1919 RMD160 e40a87f7501898cc48ee57886c9b7a5eed25c45a SHA1 aaa3f7e35313ed7f4982dc2f5f172dac6df44b86 SHA256 3ba6fe351b8912ab55e26f20913f668aeb2917905ab417baed691f14db5d48a7
 EBUILD mdadm-2.6.7.ebuild 1916 RMD160 71cb832574dc44eafe9ca1eafa5e322c79462844 SHA1 2428e7bb28e86eded9abda570c230027788e3d30 SHA256 b2fdc8f4e5351961c3e68ef2c2d5c8d0d50c9092603db365c9ad46d83bd7049b
 EBUILD mdadm-2.6.8.ebuild 1905 RMD160 544dee7abda556795d2cd00d357afa15305334b1 SHA1 946cbde625acd4be80514f3aeb94e15d2333ff46 SHA256 db3c592725b327caa5bc56fce00d504afe9b25eab19f7a8f502a38c2ed62cc44
+EBUILD mdadm-2.6.9-r1.ebuild 1977 RMD160 41dd3c473fa25f4942f4b8f148f399495aff1f2d SHA1 475642c948ce06532965f8d3bbc4e591a53aa7be SHA256 a593744ea7bf85213781ec50d29554ae402da78e11046219d409428198ae76cc
 EBUILD mdadm-2.6.9.ebuild 1926 RMD160 fbab6a88da1b92712c13bba16cc3c6e638ac6a21 SHA1 02e1351e1f2ec54d7a32d48b7ce3b5777524001e SHA256 6c612f19fbcebe9abef1b0e07477522e41105711ff59b89382863d35af7b9c23
-MISC ChangeLog 17303 RMD160 fa44288324810eb0fa2d6c78ea0ee5fcdeb8073d SHA1 78442f43a9bd18eabb89c23119a3adf41b84b783 SHA256 f63ad4b70da1748e77e1151c3bd061cad707c655dba8a08d6154d368ddc580c3
+MISC ChangeLog 17500 RMD160 4a5459695affda2c071a5f1805a98bc83d163649 SHA1 d938f9b511d03b05922a17fcb038189eb9ab5f8c SHA256 f93dd931aaa1915bfcf447db30ef4131b84bd13adbfbc12227fc9377a67a382b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-fs/mdadm/files/udev-145-64-md-raid.rules b/sys-fs/mdadm/files/udev-145-64-md-raid.rules
new file mode 100644
index 000000000000..6ba93b661ef9
--- /dev/null
+++ b/sys-fs/mdadm/files/udev-145-64-md-raid.rules
@@ -0,0 +1,36 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM!="block", GOTO="md_end"
+ACTION!="add|change", GOTO="md_end"
+
+# import data from a raid member and activate it
+#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
+# import data from a raid set
+KERNEL!="md*", GOTO="md_end"
+
+# partitions have no md/{array_state,metadata_version}
+ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
+
+# container devices have a metadata version of e.g. 'external:ddf' and
+# never leave state 'inactive'
+ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
+TEST!="md/array_state", GOTO="md_end"
+ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
+LABEL="md_ignore_state"
+
+IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
+ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
+ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
+ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
+ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace"
+ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n"
+ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
+ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
+
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+OPTIONS+="link_priority=100"
+OPTIONS+="watch"
+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/mdadm-2.6.9-r1.ebuild b/sys-fs/mdadm/mdadm-2.6.9-r1.ebuild
new file mode 100644
index 000000000000..cbf087373341
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.6.9-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.9-r1.ebuild,v 1.1 2009/07/29 19:14:32 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://neil.brown.name/blog/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"
+
+DEPEND=""
+RDEPEND=">=sys-apps/util-linux-2.16"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-2.6.4-mdassemble.patch #211426
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CROSS_COMPILE=${CHOST}- \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		all mdassemble \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	into /
+	dosbin mdassemble || die
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh raid-start.sh || die "addon failed"
+	newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die "addon failed"
+
+	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}"/udev-145-64-md-raid.rules 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"
+}