From owner-svn-ports-head@freebsd.org Mon Nov 21 20:59:12 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B999C4D19B; Mon, 21 Nov 2016 20:59:12 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC5A37C; Mon, 21 Nov 2016 20:59:11 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uALKxB1X050446; Mon, 21 Nov 2016 20:59:11 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uALKxAUt050440; Mon, 21 Nov 2016 20:59:10 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201611212059.uALKxAUt050440@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Mon, 21 Nov 2016 20:59:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426754 - in head/sysutils: bareos-client bareos-client-static bareos-server bareos-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2016 20:59:12 -0000 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"