rpms/unbound/devel sources,1.7,1.8 unbound.init,1.5,1.6

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6517

Modified Files:
	sources unbound.init 
Log Message:
Added support to init script for when /var/run is mounted as tmpfs,
and /var/run/unbound does not exist. Also fixed daemon call to supply
the pidfile (since it is in a subdir and not straight in /var/run.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jan 2009 14:54:22 -0000	1.7
+++ sources	26 Jan 2009 23:02:22 -0000	1.8
@@ -1,2 +1 @@
-43586f18b4d917887c92a35ff460c923  unbound-1.1.1.tar.gz
 2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz


Index: unbound.init
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unbound.init	28 Nov 2008 09:46:49 -0000	1.5
+++ unbound.init	26 Jan 2009 23:02:22 -0000	1.6
@@ -25,6 +25,7 @@
 config="/etc/unbound/unbound.conf"
 rootdir="/var/lib/unbound"
 pidfile="/var/run/unbound/unbound.pid"
+piddir=`dirname $pidfile`
 
 [ -e /etc/sysconfig/unbound ] && . /etc/sysconfig/unbound
 
@@ -33,6 +34,8 @@
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
+    # /var/run could (and should) be tmpfs
+    [ -d $piddir ] || mkdir $piddir
 
     if [ ! -f /etc/unbound/unbound_control.key ]
     then
@@ -46,7 +49,7 @@
     echo -n $"Starting unbound: "
 
     # if not running, start it up here
-    daemon $exec
+    daemon --pidfile=$pidfile $exec
     retval=$?
     [ $retval -eq 0 ] && touch $lockfile
     echo