sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Collect the return values of both smbd and nmbd and return with exit status of

Browse source 
either of them if one is failing.

PR:		ports/151173
Submitted by:	uqs
Approved by:	maintainer timeout (3 months)
Feature safe:	yes
This commit is contained in:
Ulrich Spörlein 2011-01-30 11:19:39 +00:00
parent 8400e4cf70
commit c9f2927883
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=268419
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/samba34/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= samba34 PORTNAME= samba34
PORTVERSION= 3.4.9 PORTVERSION= 3.4.9
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= . old-versions rc pre MASTER_SITE_SUBDIR= . old-versions rc pre

9
net/samba34/files/samba.in
View file

@ -137,7 +137,7 @@ samba_reload_cmd() {
} }
samba_cmd() { samba_cmd() {
local name rcvar command pidfile samba_daemons local name rcvar command pidfile samba_daemons result _result
# Prevent recursive calling # Prevent recursive calling
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd" unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
# Stop processes in the reverse to order # Stop processes in the reverse to order
@ -145,6 +145,7 @@ samba_cmd() {
samba_daemons=$(reverse_list ${samba_daemons}) samba_daemons=$(reverse_list ${samba_daemons})
fi fi
# Apply to all daemons # Apply to all daemons
result=0
for name in ${samba_daemons}; do for name in ${samba_daemons}; do
rcvar=$(set_rcvar) rcvar=$(set_rcvar)
command="%%PREFIX%%/sbin/${name}" command="%%PREFIX%%/sbin/${name}"
@ -152,8 +153,14 @@ samba_cmd() {
# Daemon should be enabled and running # Daemon should be enabled and running
if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args} run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
# Collect return values
_result=$?
if [ ${_result} != 0 ]; then
result=${_result}
fi
fi fi
done done
return $result
} }
run_rc_command "$1" run_rc_command "$1"