[pkgsrc/trunk]: pkgsrc/net/bind96/files Since rc1 the default location of the...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/17816371232c
branches:  trunk
changeset: 554994:17816371232c
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Mon Feb 23 09:22:16 2009 +0000

description:
Since rc1 the default location of the pidfiles have changed so update
the rc.d scripts accordingly.
Problem found by John Klos

diffstat:

 net/bind96/files/lwresd.sh |  13 ++++++++++---
 net/bind96/files/named9.sh |  14 ++++++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r bc7863869d0c -r 17816371232c net/bind96/files/lwresd.sh
--- a/net/bind96/files/lwresd.sh        Mon Feb 23 09:08:48 2009 +0000
+++ b/net/bind96/files/lwresd.sh        Mon Feb 23 09:22:16 2009 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: lwresd.sh,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $
+# $NetBSD: lwresd.sh,v 1.2 2009/02/23 09:22:16 adrianp Exp $
 #
 # PROVIDE: lwresd
 # REQUIRE: SERVERS
@@ -10,9 +10,16 @@
 name="lwresd"
 rcvar=${name}
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/lwresd/${name}.pid"
+extra_commands="reload"
+start_precmd="lwresd_precmd"
 
-extra_commands="reload"
+lwresd_precmd()
+{
+       if [ ! -d @VARBASE@/run/lwresd ]; then
+               @MKDIR@ @VARBASE@/run/lwresd
+       fi
+}
 
 load_rc_config ${name}         # check /etc/rc.conf.d/named9
 run_rc_command "$1"
diff -r bc7863869d0c -r 17816371232c net/bind96/files/named9.sh
--- a/net/bind96/files/named9.sh        Mon Feb 23 09:08:48 2009 +0000
+++ b/net/bind96/files/named9.sh        Mon Feb 23 09:22:16 2009 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: named9.sh,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $
+# $NetBSD: named9.sh,v 1.2 2009/02/23 09:22:16 adrianp Exp $
 #
 
 # PROVIDE: named
@@ -13,7 +13,7 @@
 name="named"
 rcvar="${name}9"
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/named/${name}.pid"
 start_precmd="named_precmd"
 extra_commands="reload"
 required_dirs="$named_chrootdir"       # if it is set, it must exist
@@ -27,6 +27,10 @@
                return 1
        fi
 
+               if [ ! -d @VARBASE@/run/named ]; then 
+               @MKDIR@ @VARBASE@/run/named 
+               fi      
+
        if [ -z "$named_chrootdir" ]; then
                return 0;
        fi
@@ -35,10 +39,16 @@
                @RM@ -f "${named_chrootdir}/dev/null"
                ( cd /dev ; @PAX@ -rw -pe null "${named_chrootdir}/dev" )
        fi
+
        if [ -f /etc/localtime ]; then
                @CMP@ -s /etc/localtime "${named_chrootdir}/etc/localtime" || \
                    @CP@ -p /etc/localtime "${named_chrootdir}/etc/localtime"
        fi
+
+               if [ ! -d ${named_chrootdir}@VARBASE@/run/named ]; then 
+               @MKDIR@ ${named_chrootdir}@VARBASE@/run/named 
+               fi      
+
        @RM@ -f ${pidfile}
        @LN@ -s "${named_chrootdir}${pidfile}" ${pidfile}