svn commit: r426754 - in head/sysutils: bareos-client bareos-client-static bareos-server bareos-server/files

[Jose Alonso Cardenas Marquez]

Author: acm
Date: Mon Nov 21 20:59:10 2016
New Revision: 426754
URL: https://svnweb.freebsd.org/changeset/ports/426754

Log:
  - Fix start when /var/run is on TMPFS
  - Bump PORTREVISION
  
  PR:		212282
  Submitted by:	O. Hartmann ohartmann (_at_) walstatt.org

Modified:
  head/sysutils/bareos-client-static/Makefile
  head/sysutils/bareos-client/Makefile
  head/sysutils/bareos-server/Makefile
  head/sysutils/bareos-server/files/bareos-dir.in
  head/sysutils/bareos-server/files/bareos-fd.in
  head/sysutils/bareos-server/files/bareos-sd.in

Modified: head/sysutils/bareos-client-static/Makefile
==============================================================================
--- head/sysutils/bareos-client-static/Makefile	Mon Nov 21 20:31:55 2016	(r426753)
+++ head/sysutils/bareos-client-static/Makefile	Mon Nov 21 20:59:10 2016	(r426754)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-client-static
 
 COMMENT=	Backup archiving recovery open sourced (static client)

Modified: head/sysutils/bareos-client/Makefile
==============================================================================
--- head/sysutils/bareos-client/Makefile	Mon Nov 21 20:31:55 2016	(r426753)
+++ head/sysutils/bareos-client/Makefile	Mon Nov 21 20:59:10 2016	(r426754)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)

Modified: head/sysutils/bareos-server/Makefile
==============================================================================
--- head/sysutils/bareos-server/Makefile	Mon Nov 21 20:31:55 2016	(r426753)
+++ head/sysutils/bareos-server/Makefile	Mon Nov 21 20:59:10 2016	(r426754)
@@ -4,7 +4,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	16.2.4
-#PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server

Modified: head/sysutils/bareos-server/files/bareos-dir.in
==============================================================================
--- head/sysutils/bareos-server/files/bareos-dir.in	Mon Nov 21 20:31:55 2016	(r426753)
+++ head/sysutils/bareos-server/files/bareos-dir.in	Mon Nov 21 20:59:10 2016	(r426754)
@@ -39,4 +39,8 @@ bareos_dir_testconfig()
 	eval ${command} ${bareos_dir_flags} -t
 }
 
+start_precmd() {
+	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
+}
+
 run_rc_command "$1"

Modified: head/sysutils/bareos-server/files/bareos-fd.in
==============================================================================
--- head/sysutils/bareos-server/files/bareos-fd.in	Mon Nov 21 20:31:55 2016	(r426753)
+++ head/sysutils/bareos-server/files/bareos-fd.in	Mon Nov 21 20:59:10 2016	(r426754)
@@ -31,4 +31,17 @@ command=%%PREFIX%%/sbin/bareos-fd
 command_args="-c ${bareos_fd_config}"
 pidfile="${bareos_fd_pidfile}"
 
+start_precmd() {
+	[ -d "${pidfile%/*}" ] || {
+		getent passwd bareos > /dev/null 2&>1
+		if [ $? -eq 0] ; then
+			# user bareos exists
+			install -d -o bareos -g bareos ${pidfile%/*}
+		else
+			# bareos_fd as solitair service
+			install -d -o root -g wheel ${pidfile%/*}
+		fi
+	}
+}
+
 run_rc_command "$1"

Modified: head/sysutils/bareos-server/files/bareos-sd.in
==============================================================================
--- head/sysutils/bareos-server/files/bareos-sd.in	Mon Nov 21 20:31:55 2016	(r426753)
+++ head/sysutils/bareos-server/files/bareos-sd.in	Mon Nov 21 20:59:10 2016	(r426754)
@@ -29,6 +29,10 @@ load_rc_config $name
 
 command=%%PREFIX%%/sbin/bareos-sd
 command_args="-c ${bareos_sd_config}"
-pidfile="${bacula_sd_pidfile}"
+pidfile="${bareos_sd_pidfile}"
+
+start_precmd() {
+	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
+}
 
 run_rc_command "$1"