Attachment #177087 for bug #212282

Lines 39-42 Link Here

(-)sysutils/bareos-server/files/bareos-dir.in (+4 lines)
39	eval ${command} ${bareos_dir_flags} -t	39	eval ${command} ${bareos_dir_flags} -t
40	}	40	}
41		41
		42	start_precmd() {
		43	[ -d "${pidfile%/}" ] \|\| install -d -o bareos -g bareos ${pidfile%/}
		44	}
		45
42	run_rc_command "$1"	46	run_rc_command "$1"




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"

Lines 29-34 Link Here

(-)sysutils/bareos-server/files/bareos-sd.in (-1 / +6 lines)
29		29
30	command=%%PREFIX%%/sbin/bareos-sd	30	command=%%PREFIX%%/sbin/bareos-sd
31	command_args="-c ${bareos_sd_config}"	31	command_args="-c ${bareos_sd_config}"
32	pidfile="${bacula_sd_pidfile}"	32	pidfile="${bareos_sd_pidfile}"
33		33
		34	start_precmd() {
		35	[ -d "${pidfile%/}" ] \|\| install -d -o bareos -g bareos ${pidfile%/}
		36	}
		37
		38
34	run_rc_command "$1"	39	run_rc_command "$1"

Return to bug 212282

Lines 31-34 Link Here

(-)sysutils/bareos-server/files/bareos-fd.in (+16 lines)
31	command_args="-c ${bareos_fd_config}"	31	command_args="-c ${bareos_fd_config}"
32	pidfile="${bareos_fd_pidfile}"	32	pidfile="${bareos_fd_pidfile}"
33		33
		34	start_precmd() {
		35
		36	[ -d "${pidfile%/*}" ] \|\| {
		37	getent passwd bareos > /dev/null 2&>1
		38	if [ $? -eq 0] ; then
		39	# user bareos exists
		40	install -d -o bareos -g bareos ${pidfile%/*}
		41	else
		42	# bareos_fd as solitair service
		43	install -d -o root -g wheel ${pidfile%/*}
		44	fi
		45	}
		46
		47	}
		48
		49
34	run_rc_command "$1"	50	run_rc_command "$1"