From 7c823347e2153eb88cff1b0da71cabc38e623803 Mon Sep 17 00:00:00 2001
From: robert <>
Date: Wed, 6 Apr 2011 17:10:38 +0000
Subject: [PATCH] - in case reload fails, print the failed message (from Piotr
 Sikora) - (ok) is only printed while in interactive mode, but (failed) stays 
  even for rc if the command fails

ok ajacoutot@
---
 src/etc/rc.d/rc.subr | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr
index 386c9787..24a2a0c6 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.33 2011/04/06 06:09:28 ajacoutot Exp $
+#	$OpenBSD: rc.subr,v 1.34 2011/04/06 17:10:38 robert Exp $
 
 # Default functions and variables used by rc.d(8) scripts.
 
@@ -33,7 +33,8 @@ rc_do() {
 
 rc_print() {
 	_ret=$?
-	echo ${INRC:+'-n'} "${INRC:+ }${_name}($1)"
+	[ -z "${INRC}" -o X"$1" != X"ok" ] && _pfix="($1)"
+	echo ${INRC:+'-n'} "${INRC:+ }${_name}${_pfix}"
 	return ${_ret}
 }
 
@@ -89,7 +90,7 @@ rc_cmd() {
 		fi
 		;;
 	reload)
-		rc_do rc_check && rc_do rc_reload
+		rc_do rc_check && ( rc_do rc_reload || rc_print failed )
 		;;
 	restart)
 		/etc/rc.d/${_name} stop && /etc/rc.d/${_name} start