rpms/mdadm/devel mdadm.rules,1.4,1.5 mdadm.spec,1.60,1.61

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4062

Modified Files:
	mdadm.spec 
Added Files:
	mdadm.rules 
Log Message:
* Thu Feb 19 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel2.2
- Readd our old mdadm rules file that does incremental assembly
- Remove the new mdadm rules file from upstream as we already have this in
  our udev package (and the one in the udev package already has a bug fixed)



Index: mdadm.rules
===================================================================
RCS file: mdadm.rules
diff -N mdadm.rules
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mdadm.rules	19 Feb 2009 20:20:08 -0000	1.5
@@ -0,0 +1,6 @@
+# This file causes block devices with Linux RAID (mdadm) signatures to
+# automatically cause mdadm to be run.
+# See udev(8) for syntax
+
+SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid*", \
+	RUN+="/sbin/mdadm -I $root/%k"


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mdadm.spec	13 Feb 2009 20:55:51 -0000	1.60
+++ mdadm.spec	19 Feb 2009 20:20:08 -0000	1.61
@@ -1,9 +1,10 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     0.devel2.1%{?dist}
+Release:     0.devel2.2%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel2.tar.bz2
 Source1:     mdmonitor.init
+Source2:     mdadm.rules
 Patch1:      mdadm-3.0-udev.patch
 Patch2:      mdadm-3.0-warn.patch
 Patch3:      mdadm-2.5.2-static.patch
@@ -40,8 +41,10 @@
 rm -rf $RPM_BUILD_ROOT
 install -Dp -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/udev/rules.d
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/udev/rules.d/70-mdadm-assemble.rules
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install-static
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
+rm -f $RPM_BUILD_ROOT/etc/udev/rules.d/64-*.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +83,11 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Thu Feb 19 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel2.2
+- Readd our old mdadm rules file that does incremental assembly
+- Remove the new mdadm rules file from upstream as we already have this in
+  our udev package (and the one in the udev package already has a bug fixed)
+
 * Thu Feb 12 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel2.1
 - Update to latest upstream devel release
 - Use the udev rules file included with mdadm instead of our own