rpms/mdadm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert changes introduced in 3.3-5 - the original code was correct

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
This commit is contained in:
Jes Sorensen 2014-01-31 17:50:06 +01:00
parent 91fc6ba763
commit b00ad520fd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mdadm.spec
View File

@ -1,7 +1,7 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays) Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm Name: mdadm
Version: 3.3 Version: 3.3
Release: 5%{?dist} Release: 6%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
Source1: mdmonitor.init Source1: mdmonitor.init
Source2: raid-check Source2: raid-check
@ -57,6 +57,7 @@ install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/raid-check
install -Dp -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/65-md-incremental.rules 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 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check
install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.d/raid-check install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.d/raid-check
mkdir -p -m 710 %{buildroot}/var/run/mdadm
# systemd # systemd
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
@ -65,6 +66,8 @@ install -m644 %{SOURCE6} %{buildroot}%{_unitdir}
# tmpfile # tmpfile
mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{_tmpfilesdir}
install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
mkdir -p %{buildroot}%{_localstatedir}/run/
install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
# abrt # abrt
mkdir -p %{buildroot}/etc/libreport/events.d mkdir -p %{buildroot}/etc/libreport/events.d
@ -74,9 +77,6 @@ install -m644 %{SOURCE8} %{buildroot}/etc/libreport/events.d
rm -rf %{buildroot} rm -rf %{buildroot}
%post %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 %systemd_post mdmonitor.service
/usr/bin/systemctl disable mdmonitor-takeover.service >/dev/null 2>&1 || : /usr/bin/systemctl disable mdmonitor-takeover.service >/dev/null 2>&1 || :
@ -101,10 +101,16 @@ install -d -m 0710 -o root -g root %{_localstatedir}/run/%{name}
%{_mandir}/man*/md* %{_mandir}/man*/md*
%config(noreplace) %{_sysconfdir}/cron.d/* %config(noreplace) %{_sysconfdir}/cron.d/*
%config(noreplace) %{_sysconfdir}/sysconfig/* %config(noreplace) %{_sysconfdir}/sysconfig/*
%dir %{_localstatedir}/run/%{name}/
%config(noreplace) %{_tmpfilesdir}/%{name}.conf %config(noreplace) %{_tmpfilesdir}/%{name}.conf
/etc/libreport/events.d/* /etc/libreport/events.d/*
%changelog %changelog
* Fri Jan 31 2014 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3-6
- Revert changes introduced in 3.3-5, they were based on incorrect
recommendations.
- Resolves bz1053176
* Thu Jan 30 2014 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3-5 * Thu Jan 30 2014 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3-5
- Do not create /var/run/mdadm in the rpm file, since this is sitting on - Do not create /var/run/mdadm in the rpm file, since this is sitting on
tmpfs and is created by tmpfiles during boot. tmpfs and is created by tmpfiles during boot.