rpms/mdadm/devel mdadm.rules,1.6,1.7 mdadm.spec,1.64,1.65

[Doug Ledford]

Author: dledford

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

Modified Files:
	mdadm.spec 
Added Files:
	mdadm.rules 
Log Message:
* Wed Mar 18 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.2
- Change around the mdadm udev rules we ship to avoid a udev file conflict



Index: mdadm.rules
===================================================================
RCS file: mdadm.rules
diff -N mdadm.rules
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mdadm.rules	18 Mar 2009 18:55:49 -0000	1.7
@@ -0,0 +1,8 @@
+# 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", ENV{ID_FS_TYPE}=="linux_raid_member", \
+	IMPORT{program}="/sbin/mdadm --examine --export $tempnode", \
+	RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
+


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mdadm.spec	18 Mar 2009 18:22:06 -0000	1.64
+++ mdadm.spec	18 Mar 2009 18:55:49 -0000	1.65
@@ -1,10 +1,11 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     0.devel3.1%{?dist}
+Release:     0.devel3.2%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel3.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
+Source3:     mdadm.rules
 Patch1:      mdadm-2.5.2-static.patch
 Patch2:      mdadm-3.0-cast.patch
 Patch3:      mdadm-3.0-incremental.patch
@@ -37,9 +38,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install-static
+rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/*
 install -Dp -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
 install -Dp -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/raid-check
-make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install-static
+install -Dp -m 755 %{SOURCE3} $RPM_BUILD_ROOT/lib/udev/rules.d/65-md-incremental.rules
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
 
 %clean
@@ -80,6 +83,9 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Wed Mar 18 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.2
+- Change around the mdadm udev rules we ship to avoid a udev file conflict
+
 * Tue Mar 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.1
 - Update to latest devel release
 - Remove the no longer necessary udev patch