Browse Source

Stop using the (now) internal rc.subr functions _rc_do() and _rc_wait().

- no need to start spamd in background mode
- return from rc_start() in case spamd failed to start
- execute spamd-setup without explicitly waiting for spamd
prodded by, discussed with and OK ajacoutot@
OPENBSD_5_6
rpe 10 years ago
parent
commit
5392cda9b9
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/etc/rc.d/spamd

+ 3
- 3
src/etc/rc.d/spamd View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# $OpenBSD: spamd,v 1.5 2014/07/17 15:00:06 ajacoutot Exp $
# $OpenBSD: spamd,v 1.6 2014/07/20 08:37:07 rpe Exp $
daemon="/usr/libexec/spamd" daemon="/usr/libexec/spamd"
@ -16,11 +16,11 @@ rc_pre() {
} }
rc_start() { rc_start() {
${rcexec} "${daemon} ${daemon_flags} ${_bg}"
${rcexec} "${daemon} ${daemon_flags}" || return 1
spamd_setup_flags="-D" spamd_setup_flags="-D"
[ X"${spamd_black}" != X"NO" ] && \ [ X"${spamd_black}" != X"NO" ] && \
spamd_setup_flags="-b ${spamd_setup_flags}" spamd_setup_flags="-b ${spamd_setup_flags}"
_rc_do _rc_wait start && /usr/libexec/spamd-setup ${spamd_setup_flags}
/usr/libexec/spamd-setup ${spamd_setup_flags}
} }
rc_cmd $1 rc_cmd $1

Loading…
Cancel
Save