[Pkg-ofed-commits] r1051 - /branches/upstream/srptools/trunk/debian/
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Thu Feb 16 16:44:02 UTC 2012
Author: gmpc-guest
Date: Thu Feb 16 16:44:02 2012
New Revision: 1051
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=1051
Log:
Further fixes to init scripts.
Ensure srptools output is logged to a logfile.
Modified:
branches/upstream/srptools/trunk/debian/changelog
branches/upstream/srptools/trunk/debian/srptools-boot.init
branches/upstream/srptools/trunk/debian/srptools.init
Modified: branches/upstream/srptools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/upstream/srptools/trunk/debian/changelog?rev=1051&op=diff
==============================================================================
--- branches/upstream/srptools/trunk/debian/changelog (original)
+++ branches/upstream/srptools/trunk/debian/changelog Thu Feb 16 16:44:02 2012
@@ -1,3 +1,10 @@
+srptools (0.0.4-0.1.gce1f64c-upstream-1) UNRELEASED; urgency=low
+
+ * Re-work init scripts to warp srp_daemon up with daemon.
+ Closes: #658257.
+
+ -- Guy Coates <gmpc at sanger.ac.uk> Thu, 16 Feb 2012 16:11:53 +0000
+
srptools (0.0.4-0.1.gce1f64c-OFED-1.5.2-1) experimental; urgency=low
* New OFED release.
Modified: branches/upstream/srptools/trunk/debian/srptools-boot.init
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/upstream/srptools/trunk/debian/srptools-boot.init?rev=1051&op=diff
==============================================================================
--- branches/upstream/srptools/trunk/debian/srptools-boot.init (original)
+++ branches/upstream/srptools/trunk/debian/srptools-boot.init Thu Feb 16 16:44:02 2012
@@ -38,6 +38,7 @@
run_daemon
done
done
+ return 0
fi
Modified: branches/upstream/srptools/trunk/debian/srptools.init
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/upstream/srptools/trunk/debian/srptools.init?rev=1051&op=diff
==============================================================================
--- branches/upstream/srptools/trunk/debian/srptools.init (original)
+++ branches/upstream/srptools/trunk/debian/srptools.init Thu Feb 16 16:44:02 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
### BEGIN INIT INFO
# Provides: srptools
# Required-Start: $syslog
@@ -82,14 +82,16 @@
if [ "$STATUS" = "State: Active" ] ; then
echo "Starting srp on $HCA_ID $PORT"
- daemon -r --pidfile /var/run/srp_daemon.${HCA_ID}.${PORT} -- /usr/sbin/srp_daemon -e -c -n -i ${HCA_ID} -p ${PORT} -R ${RETRIES} >> $LOG
+ daemon -r --pidfile /var/run/srp_daemon.${HCA_ID}.${PORT} -E $LOG -O $LOG -- /usr/sbin/srp_daemon -e -c -n -i ${HCA_ID} -p ${PORT} -R ${RETRIES}
RETVAL=$?
fi
}
kill_daemon () {
- PID=`cat /var/run/srp_daemon.${HCA_ID}.${PORT}`
- kill -TERM $PID
+ if [ -e /var/run/srp_daemon.${HCA_ID}.${PORT} ] ; then
+ PID=`cat /var/run/srp_daemon.${HCA_ID}.${PORT}`
+ kill -TERM $PID
+ fi
}
More information about the Pkg-ofed-commits
mailing list