diff --git a/mdadm.spec b/mdadm.spec index 6ec24ad..0d1890c 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.2.6 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check @@ -9,7 +9,6 @@ Source3: mdadm.rules Source4: mdadm-raid-check-sysconfig Source5: mdadm-cron Source6: mdmonitor.service -Source7: mdmonitor-takeover.service Source8: mdadm.conf Source9: mdadm_event.conf Patch0: mdadm-3.2.6-cgroup.patch @@ -41,6 +40,7 @@ Requires: udev initscripts %endif %if "%{fedora}" >= "17" Requires: libreport-filesystem +Conflicts: dracut < 009-14 %endif %description @@ -100,7 +100,6 @@ mkdir -p -m 700 %{buildroot}/var/run/mdadm # systemd mkdir -p %{buildroot}%{_unitdir} install -m644 %{SOURCE6} %{buildroot}%{_unitdir} -install -m644 %{SOURCE7} %{buildroot}%{_unitdir} # tmpfile mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d @@ -118,17 +117,17 @@ install -m644 %{SOURCE9} %{buildroot}/etc/libreport/events.d rm -rf %{buildroot} %post -%systemd_post mdmonitor.service mdmonitor-takeover.service +%systemd_post mdmonitor.service %preun -%systemd_preun mdmonitor.service mdmonitor-takeover.service +%systemd_preun mdmonitor.service %postun %systemd_postun_with_restart mdmonitor.service %triggerun -- %{name} < 3.2.2-3 %{_bindir}/systemd-sysv-convert --save mdmonitor >/dev/null 2>&1 || : -/bin/systemctl --no-reload enable mdmonitor.service mdmonitor-takeover.service >/dev/null 2>&1 || : +/bin/systemctl --no-reload enable mdmonitor.service >/dev/null 2>&1 || : /sbin/chkconfig --del mdmonitor >/dev/null 2>&1 || : /bin/systemctl try-restart mdmonitor.service >/dev/null 2>&1 || : @@ -144,7 +143,6 @@ rm -rf %{buildroot} /sbin/* %{_sbindir}/raid-check %{_unitdir}/mdmonitor.service -%{_unitdir}/mdmonitor-takeover.service %{_mandir}/man*/md* %config(noreplace) %{_sysconfdir}/cron.d/* %config(noreplace) %{_sysconfdir}/sysconfig/* @@ -160,6 +158,11 @@ rm -rf %{buildroot} %endif %changelog +* Fri Jan 4 2013 Jes Sorensen - 3.2.6-8 +- mdmonitor-takeover.service is obsolete with the --offroot support, + and it is harmful as of 3.2.6 +- Resolves bz834245 + * Mon Dec 10 2012 Jes Sorensen - 3.2.6-7 - Fix issue with udev scripts where if an raid volume with one of the disks failing, the failed disk is still present in the volume diff --git a/mdmonitor-takeover.service b/mdmonitor-takeover.service deleted file mode 100644 index 10aa0b2..0000000 --- a/mdmonitor-takeover.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Software RAID Monitor Takeover -Before=sysinit.target shutdown.target -Conflicts=shutdown.target -DefaultDependencies=no - -[Service] -Type=forking -RemainAfterExit=yes -ExecStart=/sbin/mdmon --takeover --all - -[Install] -WantedBy=sysinit.target