--QTprm0S8XgL7H0Dt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sun, Oct 30, 2005 at 02:01:53PM +0100, Geert Hendrickx wrote:
> 
> It's not necessary to have a subdir at all, because the pidfiles are
> created with root privileges.  So they can simply go in /var/run (as they
> should).  

I didn't know that. I thought there was a reason for using a
subdirectory :-) That would leave the attached diff to fix the naming
and location.

Joerg

--QTprm0S8XgL7H0Dt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bacula.diff"

Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- Makefile.common	16 Oct 2005 11:59:35 -0000	1.12
+++ Makefile.common	30 Oct 2005 21:16:46 -0000
@@ -18,7 +18,7 @@
 GNU_CONFIGURE=		yes
 
 PKG_SYSCONFSUBDIR?=	bacula
-BACULA_PIDDIR?=		${VARBASE}/run/bacula
+BACULA_PIDDIR?=		${VARBASE}/run
 BACULA_WORKINGDIR?=	${VARBASE}/spool/bacula
 
 OWN_DIRS_PERMS=		${BACULA_PIDDIR} root ${BACULA_GROUP} 770
Index: files/bacula-dir.sh
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/files/bacula-dir.sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bacula-dir.sh
--- files/bacula-dir.sh	6 Nov 2004 16:17:38 -0000	1.1.1.1
+++ files/bacula-dir.sh	30 Oct 2005 21:16:46 -0000
@@ -11,7 +11,7 @@
 rcvar=$name
 command="@PREFIX@/sbin/bacula-dir"
 required_files="@BACULA_ETCDIR@/bacula-dir.conf"
-pidfile="@BACULA_PIDDIR@/bacula-dir.9101.pid"
+pidfile="@BACULA_PIDDIR@/bacula-dir.pid"
 command_args="-c ${required_files} -u @BACULA_DIR_USER@ -g @BACULA_GROUP@"
 
 if [ -f /etc/rc.subr ]; then
Index: files/bacula-fd.sh
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/files/bacula-fd.sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bacula-fd.sh
--- files/bacula-fd.sh	6 Nov 2004 16:17:38 -0000	1.1.1.1
+++ files/bacula-fd.sh	30 Oct 2005 21:16:46 -0000
@@ -11,7 +11,7 @@
 rcvar=$name
 command="@PREFIX@/sbin/bacula-fd"
 required_files="@BACULA_ETCDIR@/bacula-fd.conf"
-pidfile="@BACULA_PIDDIR@/bacula-fd.9102.pid"
+pidfile="@BACULA_PIDDIR@/bacula-fd.pid"
 command_args="-c ${required_files}"
 
 if [ -f /etc/rc.subr ]; then
Index: files/bacula-sd.sh
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/files/bacula-sd.sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bacula-sd.sh
--- files/bacula-sd.sh	6 Nov 2004 16:17:38 -0000	1.1.1.1
+++ files/bacula-sd.sh	30 Oct 2005 21:16:46 -0000
@@ -11,7 +11,7 @@
 rcvar=$name
 command="@PREFIX@/sbin/bacula-sd"
 required_files="@BACULA_ETCDIR@/bacula-sd.conf"
-pidfile="@BACULA_PIDDIR@/bacula-sd.9103.pid"
+pidfile="@BACULA_PIDDIR@/bacula-sd.pid"
 command_args="-c ${required_files} -u @BACULA_SD_USER@ -g @BACULA_GROUP@"
 
 if [ -f /etc/rc.subr ]; then

--QTprm0S8XgL7H0Dt--