- 0001-Makefile-install-mdadm-grow-continue-.service.patch

make sure mdadm-grow-continue.service is installed properly.
- remove mkinitrd files, we now use dracut

OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=109

0001-Makefile-install-mdadm-grow-continue-.service.patch

@@ -0,0 +1,28 @@
+From 616f197f9d6d044afb9e27ddc9cd087d21d610f0 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Tue, 10 Jun 2014 20:34:40 +1000
+Subject: [PATCH] Makefile: install mdadm-grow-continue@.service
+
+Forgot to add this to install-systemd target
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c7e7a4272cde..1a4a5dcdb720 100644
+--- a/Makefile
++++ b/Makefile
+@@ -290,7 +290,7 @@ install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules
+ 
+ install-systemd: systemd/mdmon@.service
+ 	@for file in mdmon@.service mdmonitor.service mdadm-last-resort@.timer \
+-		mdadm-last-resort@.service ; \
++		mdadm-last-resort@.service mdadm-grow-continue@.service; \
+ 	do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp && \
+ 	   echo $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
+ 	   $(INSTALL) -D -m 644 .install.tmp $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
+-- 
+2.0.0
+

mdadm.changes

@@ -3,6 +3,9 @@ Tue Jun 10 04:05:48 UTC 2014 - nfbrown@suse.com
 
 - new upstream release 3.3.1, incorporates all current patches
   and includes assorted other minor fixes.
+- 0001-Makefile-install-mdadm-grow-continue-.service.patch
+  make sure mdadm-grow-continue.service is installed properly.
+- remove mkinitrd files, we now use dracut
 
 - Delete  0001-Assemble-allow-load_devices-to-change-the-st-which-i.patch
 - Delete  0001-DDF-mark-missing-on-assembly-device-properly.patch

mdadm.spec

@@ -37,9 +37,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
 Source1:        Software-RAID.HOWTO.tar.bz2
 Source2:        sysconfig.mdadm
-Source5:        mkinitrd-setup.sh
-Source6:        mkinitrd-boot.sh
 Source7:        mdadm.cron
+# PATCH-FIX-UPSTREAM 0001-Makefile-install-mdadm-grow-continue-.service.patch nfbrown@suse.de
+Patch1:         0001-Makefile-install-mdadm-grow-continue-.service.patch
 
 %define _udevdir %(pkg-config --variable=udevdir udev)
 %define _systemdshutdowndir %{_unitdir}/../system-shutdown
@@ -51,6 +51,7 @@ programs but with a very different interface.
 
 %prep
 %setup -q -a1
+%patch1 -p1
 
 %build
 make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes
@@ -63,9 +64,6 @@ make install install-systemd install-udev DESTDIR=%{buildroot} SYSTEMD_DIR=%{_un
 rm -rf %{buildroot}/lib/udev
 install -d %{buildroot}%{_var}/adm/fillup-templates
 install -d %{buildroot}{%{_sbindir}
-install -d %{buildroot}/lib/mkinitrd/scripts
-install -m 755 %{S:5} %{buildroot}/lib/mkinitrd/scripts/setup-md.sh
-install -m 755 %{S:6} %{buildroot}/lib/mkinitrd/scripts/boot-md.sh
 install -d %{buildroot}/etc/cron.daily
 install -m 755 %{S:7} %{buildroot}/etc/cron.daily/mdadm
 install -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/
@@ -105,10 +103,6 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man?/*
 /sbin/*
 %{_var}/adm/fillup-templates/sysconfig.mdadm
-%dir /lib/mkinitrd
-%dir /lib/mkinitrd/scripts
-/lib/mkinitrd/scripts/setup-md.sh
-/lib/mkinitrd/scripts/boot-md.sh
 %{_udevdir}/rules.d/63-md-raid-arrays.rules
 %{_udevdir}/rules.d/64-md-raid-assembly.rules
 %dir /etc/cron.daily
@@ -118,6 +112,7 @@ rm -rf %{buildroot}
 %{_unitdir}/mdmonitor.service
 %{_unitdir}/mdadm-last-resort@.timer
 %{_unitdir}/mdadm-last-resort@.service
+%{_unitdir}/mdadm-grow-continue@.service
 %dir %{_unitdir}/../scripts
 %{_unitdir}/../scripts/mdadm_env.sh