diff options
| author | Ulrich Spörlein <uqs@FreeBSD.org> | 2011-01-30 11:19:39 +0000 |
|---|---|---|
| committer | Ulrich Spörlein <uqs@FreeBSD.org> | 2011-01-30 11:19:39 +0000 |
| commit | c9f2927883e17dd44effcdff501a5149ae59f480 (patch) | |
| tree | f71293b76e15ba69a939ef280ac1e419a02a7cb4 /net | |
| parent | Update to 3.3.0. (diff) | |
Collect the return values of both smbd and nmbd and return with exit status of
either of them if one is failing.
PR: ports/151173
Submitted by: uqs
Approved by: maintainer timeout (3 months)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268419
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba34/Makefile | 2 | ||||
| -rw-r--r-- | net/samba34/files/samba.in | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/net/samba34/Makefile b/net/samba34/Makefile index caf83ee9ab87..09dbf7538c95 100644 --- a/net/samba34/Makefile +++ b/net/samba34/Makefile @@ -7,7 +7,7 @@ PORTNAME= samba34 PORTVERSION= 3.4.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= . old-versions rc pre diff --git a/net/samba34/files/samba.in b/net/samba34/files/samba.in index e955b72f576a..cb86f976ea5f 100644 --- a/net/samba34/files/samba.in +++ b/net/samba34/files/samba.in @@ -137,7 +137,7 @@ samba_reload_cmd() { } samba_cmd() { - local name rcvar command pidfile samba_daemons + local name rcvar command pidfile samba_daemons result _result # Prevent recursive calling unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd" # Stop processes in the reverse to order @@ -145,6 +145,7 @@ samba_cmd() { samba_daemons=$(reverse_list ${samba_daemons}) fi # Apply to all daemons + result=0 for name in ${samba_daemons}; do rcvar=$(set_rcvar) command="%%PREFIX%%/sbin/${name}" @@ -152,8 +153,14 @@ samba_cmd() { # Daemon should be enabled and running if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args} + # Collect return values + _result=$? + if [ ${_result} != 0 ]; then + result=${_result} + fi fi done + return $result } run_rc_command "$1" |