diff --git a/mdadm.spec b/mdadm.spec index a3863e5..7dbeb94 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: mdadm controls Linux md devices (software RAID arrays) Name: mdadm Version: 1.5.0 -Release: 10 +Release: 11 Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init Source2: mdmpd-0.3.tgz @@ -39,6 +39,7 @@ install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd +mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm %clean [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT @@ -73,8 +74,13 @@ fi %config(noreplace,missingok)/%{_sysconfdir}/mdadm.conf %{_mandir}/man*/md* %attr(0700,root,root) %dir /var/run/mdmpd +%attr(0700,root,root) %dir /var/run/mdadm %changelog +* Fri Jul 30 2004 Dan Walsh 1.5.0-11 +- Create a directory /var/run/mdadm to contain mdadm.pid +- This cleans up SELinux problem + * Tue Jun 15 2004 Elliot Lee - rebuilt diff --git a/mdmonitor.init b/mdmonitor.init index 0e8b8e5..a40f9a0 100755 --- a/mdmonitor.init +++ b/mdmonitor.init @@ -36,16 +36,16 @@ start () ulimit -S -c 0 >/dev/null 2>&1 echo -n $"Starting $prog: " daemon --check mdadm \ - "/bin/bash -c \"mdadm --monitor --scan -f > /var/run/mdadm.pid\"" + "/bin/bash -c \"mdadm --monitor --scan -f > /var/run/mdadm/mdadm.pid\"" # hack: wait for mdadm to die, assume success if it doesn't die quickly usleep 100000 - if [ -s /var/run/mdadm.pid -a -d /proc/$(cat /var/run/mdadm.pid) ] ; then + if [ -s /var/run/mdadm/mdadm.pid -a -d /proc/$(cat /var/run/mdadm/mdadm.pid) ] ; then success $"mdadm" RETVAL=0 touch /var/lock/subsys/$prog else failure $"mdadm" - rm -f /var/run/mdadm.pid + rm -f /var/run/mdadm/mdadm.pid rm -f /var/lock/subsys/$prog RETVAL=1 fi @@ -57,7 +57,7 @@ stop () echo -n "Killing $prog: " killproc mdadm echo - rm -f /var/run/mdadm.pid + rm -f /var/run/mdadm/mdadm.pid rm -f /var/lock/subsys/$prog }