- assemble-EXCL-race.fix: avoid some races during

array assembled- particularly at boot (bnc#793954)
- boot.md: make sure systemd-udev-trigger runs before
  boot.md to avoid races: bnc#793954
- mdmon@.service - new file plus patches to allow
  mdmon to be started by systemd, so it doesn't
  kill it (bnc#321366)

OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=85
This commit is contained in:
Neil Brown
2013-06-13 04:16:10 +00:00
committed by Git OBS Bridge
parent cd373fb85d
commit e25ca3c260
8 changed files with 356 additions and 3 deletions

View File

@@ -20,6 +20,7 @@ Name: mdadm
Version: 3.2.6
Release: 0
BuildRequires: binutils-devel
BuildRequires: groff
BuildRequires: pkgconfig
BuildRequires: sgmltool
BuildRequires: pkgconfig(libudev)
@@ -42,9 +43,19 @@ Source5: mkinitrd-setup.sh
Source6: mkinitrd-boot.sh
Source7: mdadm.cron
Source8: mdadm.shutdown
#PATCH-FIX-UPSTREAM assemble-EXCL-race.fix bnc#793954
Patch1: assemble-EXCL-race.fix
#PATCH-FIX-UPSTREAM 0001-Add-support-for-launching-mdmon-via-systemctl-instea.patch bnc#821366
Patch2: 0001-Add-support-for-launching-mdmon-via-systemctl-instea.patch
#PATCH-FIX-UPSTREAM 0002-In-case-launching-mdmon-fails-print-an-error-message.patch bnc#821366
Patch3: 0002-In-case-launching-mdmon-fails-print-an-error-message.patch
#PATCH-FIX-UPSTREAM 0003-mdmon-add-foreground-option.patch bnc#821366
Patch4: 0003-mdmon-add-foreground-option.patch
#PATCH-FIX-UPSTREAM 0004-Suppress-error-messages-from-systemctl.patch bnc#821366
Patch5: 0004-Suppress-error-messages-from-systemctl.patch
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
%define _systemdshutdowndir %{_unitdir}/../system-shutdown
%define _systemdshutdowndir %{_unitdir}/../system-shutdown
%description
Mdadm is a program that can be used to control Linux md devices. It is
@@ -53,6 +64,11 @@ programs but with a very different interface.
%prep
%setup -q -a1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error"
@@ -61,7 +77,7 @@ sgml2html Software-RAID.HOWTO.sgml
sgml2txt Software-RAID.HOWTO.sgml
%install
make install DESTDIR=%{buildroot}
make install install-systemd DESTDIR=%{buildroot} SYSTEMD_DIR=%{_unitdir}
rm -rf %{buildroot}/lib/udev
install -d %{buildroot}%{_var}/adm/fillup-templates
install -d %{buildroot}{%{_sbindir},%{_sysconfdir}/init.d}
@@ -125,5 +141,6 @@ rm -rf %{buildroot}
%dir /etc/cron.daily
/etc/cron.daily/mdadm
%{_systemdshutdowndir}/mdadm.shutdown
%{_unitdir}/mdmon@.service
%changelog