- use /var/run/eximq for pid files

Changed files:
    eximq.init -> 1.2
    eximq.spec -> 1.2

diff --git a/eximq.init b/eximq.init
index a07a0f065b67cfe9ed4057e6656604f688b9cacb..f07255c68fc492e7a417f668fa73f64a3a16a96a 100644 (file)
--- a/eximq.init
+++ b/eximq.init
@@ -34,7 +34,7 @@ case "$1" in
                grep -v -e '^[[:space:]]*$' -e '^#' $EXIMQ_CONFIG | while read args; do
                        n=$(printf '%02d' $(($n+1)))
                        msg_starting "eximq $n daemon"
-                       daemon --user exim --makepid --pidfile /var/run/eximq.$n.pid --fork /usr/sbin/eximq.pl $args
+                       daemon --user exim /usr/sbin/eximq.pl --pidfile /var/run/eximq/eximq.$n.pid --daemon $args
                        RETVAL=$?
                done
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/eximq
@@ -49,7 +49,7 @@ case "$1" in
                grep -v -e '^[[:space:]]*$' -e '^#' $EXIMQ_CONFIG | while read args; do
                        n=$(printf '%02d' $(($n+1)))
                        msg_stopping "eximq $n daemon"
-                       killproc --pidfile /var/run/eximq.$n.pid eximq.pl
+                       killproc --pidfile /var/run/eximq/eximq.$n.pid eximq.pl
                done
                rm -f /var/lock/subsys/eximq >/dev/null 2>&1
        else

diff --git a/eximq.spec b/eximq.spec
index 914f391aff702a4abdbfaf49e22be0bcda4e983b..b54fc006bfcc9cc71817b0e262362a100dd37f7e 100644 (file)
--- a/eximq.spec
+++ b/eximq.spec
@@ -25,7 +25,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,mail},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,mail},%{_sbindir},/var/run/eximq}
 
 install %{SOURCE0} $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mail/eximq.args
@@ -49,3 +49,4 @@ fi
 %attr(755,root,root) %{_sbindir}/eximq.pl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/%{name}.args
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
+%attr(755,exim,root) /var/run/eximq