Thu Feb 26 23:49:24 2009 UTC ()
${CHOWN} the pid directory as well for chroot running


(adrianp)
diff -r1.2 -r1.3 pkgsrc/net/bind96/files/named9.sh
cvs diff -r1.2 -r1.3 pkgsrc/net/bind96/files/Attic/named9.sh (expand / switch to unified diff)

--- pkgsrc/net/bind96/files/Attic/named9.sh 2009/02/23 09:22:16 1.2
+++ pkgsrc/net/bind96/files/Attic/named9.sh 2009/02/26 23:49:24 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: named9.sh,v 1.2 2009/02/23 09:22:16 adrianp Exp $ 3# $NetBSD: named9.sh,v 1.3 2009/02/26 23:49:24 adrianp Exp $
4# 4#
5 5
6# PROVIDE: named 6# PROVIDE: named
7# REQUIRE: SERVERS 7# REQUIRE: SERVERS
8# BEFORE: DAEMON 8# BEFORE: DAEMON
9# KEYWORD: chrootdir 9# KEYWORD: chrootdir
10 10
11. /etc/rc.subr 11. /etc/rc.subr
12 12
13name="named" 13name="named"
14rcvar="${name}9" 14rcvar="${name}9"
15command="@PREFIX@/sbin/${name}" 15command="@PREFIX@/sbin/${name}"
16pidfile="@VARBASE@/run/named/${name}.pid" 16pidfile="@VARBASE@/run/named/${name}.pid"
@@ -37,25 +37,26 @@ named_precmd() @@ -37,25 +37,26 @@ named_precmd()
37 37
38 if [ ! -c "${named_chrootdir}/dev/null" ]; then 38 if [ ! -c "${named_chrootdir}/dev/null" ]; then
39 @RM@ -f "${named_chrootdir}/dev/null" 39 @RM@ -f "${named_chrootdir}/dev/null"
40 ( cd /dev ; @PAX@ -rw -pe null "${named_chrootdir}/dev" ) 40 ( cd /dev ; @PAX@ -rw -pe null "${named_chrootdir}/dev" )
41 fi 41 fi
42 42
43 if [ -f /etc/localtime ]; then 43 if [ -f /etc/localtime ]; then
44 @CMP@ -s /etc/localtime "${named_chrootdir}/etc/localtime" || \ 44 @CMP@ -s /etc/localtime "${named_chrootdir}/etc/localtime" || \
45 @CP@ -p /etc/localtime "${named_chrootdir}/etc/localtime" 45 @CP@ -p /etc/localtime "${named_chrootdir}/etc/localtime"
46 fi 46 fi
47 47
48 if [ ! -d ${named_chrootdir}@VARBASE@/run/named ]; then  48 if [ ! -d ${named_chrootdir}@VARBASE@/run/named ]; then
49 @MKDIR@ ${named_chrootdir}@VARBASE@/run/named  49 @MKDIR@ ${named_chrootdir}@VARBASE@/run/named
 50 @CHOWN@ @BIND_USER@ ${named_chrootdir}@VARBASE@/run/named
50 fi  51 fi
51 52
52 @RM@ -f ${pidfile} 53 @RM@ -f ${pidfile}
53 @LN@ -s "${named_chrootdir}${pidfile}" ${pidfile} 54 @LN@ -s "${named_chrootdir}${pidfile}" ${pidfile}
54 55
55 # Change run_rc_commands()'s internal copy of $named_flags 56 # Change run_rc_commands()'s internal copy of $named_flags
56 # 57 #
57 rc_flags="-u @BIND_USER@ -t ${named_chrootdir} $rc_flags" 58 rc_flags="-u @BIND_USER@ -t ${named_chrootdir} $rc_flags"
58} 59}
59 60
60load_rc_config "$rcvar" 61load_rc_config "$rcvar"
61run_rc_command "$1" 62run_rc_command "$1"