diff --git a/mdadm.spec b/mdadm.spec index 654bf34..2b6215e 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.3 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check @@ -57,7 +57,6 @@ install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/raid-check install -Dp -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/65-md-incremental.rules install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.d/raid-check -mkdir -p -m 700 %{buildroot}/var/run/mdadm # systemd mkdir -p %{buildroot}%{_unitdir} @@ -66,8 +65,6 @@ install -m644 %{SOURCE6} %{buildroot}%{_unitdir} # tmpfile mkdir -p %{buildroot}%{_tmpfilesdir} install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf -mkdir -p %{buildroot}%{_localstatedir}/run/ -install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/ # abrt mkdir -p %{buildroot}/etc/libreport/events.d @@ -77,6 +74,9 @@ install -m644 %{SOURCE8} %{buildroot}/etc/libreport/events.d rm -rf %{buildroot} %post +# /var/run/mdadm is normally created during boot, but we need to create it +# here for the install process +install -d -m 0710 -o root -g root %{_localstatedir}/run/%{name} %systemd_post mdmonitor.service /usr/bin/systemctl disable mdmonitor-takeover.service >/dev/null 2>&1 || : @@ -101,15 +101,19 @@ rm -rf %{buildroot} %{_mandir}/man*/md* %config(noreplace) %{_sysconfdir}/cron.d/* %config(noreplace) %{_sysconfdir}/sysconfig/* -%dir %{_localstatedir}/run/%{name}/ %config(noreplace) %{_tmpfilesdir}/%{name}.conf /etc/libreport/events.d/* %changelog +* Thu Jan 30 2014 Jes Sorensen - 3.3-5 +- Do not create /var/run/mdadm in the rpm file, since this is sitting on + tmpfs and is created by tmpfiles during boot. +- Resolves bz1053176 + * Thu Oct 10 2013 Jes Sorensen - 3.3-4 - Fix byteswap macros return types to allow for building on big endian architectures again. -- Resolvez bz1015494 +- Resolves bz1015494 * Wed Oct 9 2013 Jes Sorensen - 3.3-3 - Check for DM_UDEV_DISABLE_OTHER_RULES_FLAG instead of