From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 11 Nov 2021 10:37:36 +0000 (+0000)
Subject: Return 0 in case we reach KILL; this allows "restart" to work as expected
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6b32926342a0218dc2f1a1b3d41cf93088e5266d;p=openbsd

Return 0 in case we reach KILL; this allows "restart" to work as expected
in this situation.

reported by and ok robert@
---

diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr
index dfdd9229342..9172157f147 100644
--- a/etc/rc.d/rc.subr
+++ b/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.144 2021/11/09 11:29:33 sthen Exp $
+#	$OpenBSD: rc.subr,v 1.145 2021/11/11 10:37:36 ajacoutot Exp $
 #
 # Copyright (c) 2010, 2011, 2014-2021 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -133,7 +133,14 @@ _rc_exit() {
 	local _pfix
 	[ -z "${INRC}" -o X"$1" != X"ok" ] && _pfix="($1)"
 	echo ${INRC:+'-n'} "${_pfix}"
-	[ X"$1" = X"ok" ] && exit 0 || exit 1
+	case "$1" in
+	ok|killed)
+		exit 0 ;;
+	timeout)
+		exit 142 ;;
+	*)
+		exit 1 ;;
+	esac
 }
 
 _rc_alarm()