From 42579c47cb00f8a9bea8b893f5ac7e54f9d90cd9 Mon Sep 17 00:00:00 2001 From: Michael Schloh von Bennewitz Date: Thu, 27 Nov 2003 13:55:22 +0000 Subject: [PATCH] correct removal of pid files --- bs/bs.spec | 2 +- bs/rc.bs | 14 +++++++------- cvsd/cvsd.spec | 2 +- cvsd/rc.cvsd | 2 +- jabberd/jabberd.spec | 2 +- jabberd/rc.jabberd | 2 +- kerberos/kerberos.spec | 2 +- kerberos/rc.kerberos | 4 ++-- msntp/msntp.spec | 2 +- msntp/rc.msntp | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bs/bs.spec b/bs/bs.spec index a962bc4200..26464f5bff 100644 --- a/bs/bs.spec +++ b/bs/bs.spec @@ -37,7 +37,7 @@ Distribution: OpenPKG [JUNK] Group: Network License: GNU Version: %{V_major}%{V_patch} -Release: 20031027 +Release: 20031127 # list of sources Source0: http://osdn.dl.sourceforge.net/sourceforge/bigsister/big-sister-%{version}.tar.gz diff --git a/bs/rc.bs b/bs/rc.bs index 60a8e6465c..bd0eb5f0d1 100644 --- a/bs/rc.bs +++ b/bs/rc.bs @@ -37,36 +37,36 @@ rcService bs enable yes || exit 0 if [ -f @l_prefix@/var/bs/bs.pid ]; then kill -TERM `cat @l_prefix@/var/bs/bs.pid` - rm @l_prefix@/var/bs/bs.pid + rm -f @l_prefix@/var/bs/bs.pid 2>/dev/null || true fi if [ -f @l_prefix@/var/bs/bbd.pid ]; then kill -TERM `cat @l_prefix@/var/bs/bbd.pid` - rm @l_prefix@/var/bs/bbd.pid + rm -f @l_prefix@/var/bs/bbd.pid 2>/dev/null || true fi if [ -f @l_prefix@/var/bs/uxmon.pid ]; then kill -TERM `cat @l_prefix@/var/bs/uxmon.pid` - rm @l_prefix@/var/bs/uxmon.pid + rm -f @l_prefix@/var/bs/uxmon.pid 2>/dev/null || true fi if [ -f @l_prefix@/var/bs/run/apache.pid ]; then ${bs_apachectl} stop - rm @l_prefix@/var/bs/run/apache.pid + rm -f @l_prefix@/var/bs/run/apache.pid 2>/dev/null || true fi %restart -u @l_rusr@ rcService bs enable yes || exit 0 if [ -f @l_prefix@/var/bs/bs.pid ]; then kill -TERM `cat @l_prefix@/var/bs/bs.pid` - rm @l_prefix@/var/bs/bs.pid + rm -f @l_prefix@/var/bs/bs.pid 2>/dev/null || true sleep 2 fi if [ -f @l_prefix@/var/bs/bbd.pid ]; then kill -TERM `cat @l_prefix@/var/bs/bbd.pid` - rm @l_prefix@/var/bs/bbd.pid + rm -f @l_prefix@/var/bs/bbd.pid 2>/dev/null || true sleep 2 fi if [ -f @l_prefix@/var/bs/uxmon.pid ]; then kill -TERM `cat @l_prefix@/var/bs/uxmon.pid` - rm @l_prefix@/var/bs/uxmon.pid + rm -f @l_prefix@/var/bs/uxmon.pid 2>/dev/null || true sleep 2 fi if [ -f @l_bsdir@/bin/bsmon -a -f @l_bsdir@/etc/bsmon.cfg ]; then diff --git a/cvsd/cvsd.spec b/cvsd/cvsd.spec index e6cc69e76d..f3563d8414 100644 --- a/cvsd/cvsd.spec +++ b/cvsd/cvsd.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: SCM License: GPL Version: 1.0.0 -Release: 20030929 +Release: 20031127 # package options %option with_fsl yes diff --git a/cvsd/rc.cvsd b/cvsd/rc.cvsd index b938cd54b2..52e86b513b 100644 --- a/cvsd/rc.cvsd +++ b/cvsd/rc.cvsd @@ -51,7 +51,7 @@ rcService cvsd enable yes || exit 0 rcService cvsd active no && exit 0 cvsd_signal TERM - rm -f $cvsd_pidfile + rm -f $cvsd_pidfile 2>/dev/null || true %restart -u @l_susr@ rcService cvsd enable yes || exit 0 diff --git a/jabberd/jabberd.spec b/jabberd/jabberd.spec index c66b8bc8ca..c34ac7ca81 100644 --- a/jabberd/jabberd.spec +++ b/jabberd/jabberd.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL] Group: Network License: JOSL/GPL Version: 1.4.2 -Release: 20031007 +Release: 20031127 # list of sources Source0: http://jabberd.jabberstudio.org/downloads/jabber-%{version}.tar.gz diff --git a/jabberd/rc.jabberd b/jabberd/rc.jabberd index 0045a3c374..03074f42d4 100644 --- a/jabberd/rc.jabberd +++ b/jabberd/rc.jabberd @@ -46,7 +46,7 @@ rcService jabberd enable yes || exit 0 rcService jabberd active no && exit 0 jabberd_signal TERM - rm -f $jabberd_pidfile + rm -f $jabberd_pidfile 2>/dev/null || true %restart -u @l_nusr@ rcService jabberd enable yes || exit 0 diff --git a/kerberos/kerberos.spec b/kerberos/kerberos.spec index 0cf70f8dcc..e469e79cf0 100644 --- a/kerberos/kerberos.spec +++ b/kerberos/kerberos.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Cryptography License: MIT Version: 1.3.1 -Release: 20031030 +Release: 20031127 # package options %option with_fsl yes diff --git a/kerberos/rc.kerberos b/kerberos/rc.kerberos index 684549110b..1474427ff2 100644 --- a/kerberos/rc.kerberos +++ b/kerberos/rc.kerberos @@ -56,8 +56,8 @@ rcService kerberos active no && exit 0 krb5kdc_signal TERM kadmind_signal TERM - rm -f $krb5kdc_pidfile - rm -f $kadmind_pidfile + rm -f $krb5kdc_pidfile 2>/dev/null || true + rm -f $kadmind_pidfile 2>/dev/null || true %restart -u @l_susr@ rcService kerberos enable yes || exit 0 diff --git a/msntp/msntp.spec b/msntp/msntp.spec index 47e1761724..1b75ea496d 100644 --- a/msntp/msntp.spec +++ b/msntp/msntp.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Network License: OSS-style Version: 1.6 -Release: 20030918 +Release: 20031127 # package options %option with_fsl yes diff --git a/msntp/rc.msntp b/msntp/rc.msntp index ccca86d9e8..2bc9f95799 100644 --- a/msntp/rc.msntp +++ b/msntp/rc.msntp @@ -36,7 +36,7 @@ rcService msntp enable yes || exit 0 rcService msntp active no && exit 0 msntp_signal TERM - rm -f $msntp_pidfile + rm -f $msntp_pidfile 2>/dev/null || true %restart -u @l_susr@ rcService msntp enable yes || exit 0