summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2014-11-17 13:52:44 +0000
committerajacoutot <ajacoutot@openbsd.org>2014-11-17 13:52:44 +0000
commit1d608255bff1d8766338ca01bde4f2a052717e3b (patch)
tree47cd89b44345cd5968d1e794dafb9726786784cd
parentSync our kernel AES code to the one shipped in OpenSSL/LibreSSL. (diff)
downloadwireguard-openbsd-1d608255bff1d8766338ca01bde4f2a052717e3b.tar.xz
wireguard-openbsd-1d608255bff1d8766338ca01bde4f2a052717e3b.zip
"reload" should fail if the service is not running in the first place.
ok robert@ sthen@
-rw-r--r--etc/rc.d/rc.subr5
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr
index 583d9ce9363..0c9c7dc2afc 100644
--- a/etc/rc.d/rc.subr
+++ b/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.subr,v 1.89 2014/08/30 20:33:27 ajacoutot Exp $
+# $OpenBSD: rc.subr,v 1.90 2014/11/17 13:52:44 ajacoutot Exp $
#
# Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -226,9 +226,8 @@ rc_cmd() {
_rc_exit ok
;;
reload)
- _rc_do rc_check || exit 0
echo $_n "${INRC:+ }${_name}"
- _rc_do rc_reload || _rc_exit failed
+ _rc_do rc_check && _rc_do rc_reload || _rc_exit failed
_rc_do _rc_wait reload || _rc_exit failed
_rc_exit ok
;;