From 2fd6d0dc52dcc405ddf906a97c0a9580b285ab45 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 19 Feb 2009 20:20:08 +0000 Subject: [PATCH] - 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) --- mdadm.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mdadm.spec b/mdadm.spec index 4e79be5..697b801 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -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 @@ make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="% 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 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Thu Feb 19 2009 Doug Ledford - 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 - 3.0-0.devel2.1 - Update to latest upstream devel release - Use the udev rules file included with mdadm instead of our own