[gentoo-commits] proj/openrc:master commit in: man/, sh/

["Christian Ruppert" <idl0r@gentoo.org>]

commit:     0406c6085bb25ace04c7880f860219ebfc67a16f
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 14:57:46 2012 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 14:57:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0406c608

Add restart_pre/restart_post support, also document RC_CMD

---
 man/runscript.8    |    8 ++++++++
 sh/runscript.sh.in |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/man/runscript.8 b/man/runscript.8
index b87f8ef..d823e33 100644
--- a/man/runscript.8
+++ b/man/runscript.8
@@ -357,6 +357,9 @@ In a Gentoo Prefix installation, this variable contains the prefix
 offset. Otherwise it is undefined.
 .It Va RC_UNAME
 The result of `uname -s`.
+.It Va RC_CMD
+Name of the command like start, stop, restart, ...
+RC_CMD is one way to determine whether it's a restart or normal start/stop.
 .El
 .Sh FILES
 .Pp
@@ -444,6 +447,11 @@ depend()
     need ${_need}
 }
 
+restart_pre() {
+	# Verify a config and abort the restart in case it's not valid
+	...
+}
+
 start_pre()
 {
     # Ensure that our dirs are correct

diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 6ad2ded..3b9a72d 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -285,15 +285,37 @@ while [ -n "$1" ]; do
 				case $1 in
 						start|stop|status) verify_boot;;
 				esac
+
+				# FIXME: We may want to skip the start/stop _pre functions later
+				# restart_pre
+				if [ "${RC_CMD}" = "restart" ]; then
+					if [ "${1}" = "stop" -a "$(command -v "restart_pre")" = "restart_pre" ]; then
+						restart_pre || exit $?
+					fi
+				fi
+
+				# Execute _pre functions
 				if [ "$(command -v "$1_pre")" = "$1_pre" ]
 				then
 					"$1"_pre || exit $?
 				fi
+
+				# Execute the actual command/function, start, stop, ...
 				"$1" || exit $?
+
+				# restart_post
+				if [ "${RC_CMD}" = "restart" ]; then
+					if [ "${1}" = "start" -a "$(command -v "restart_post")" = "restart_post" ]; then
+						restart_post || exit $?
+					fi
+				fi
+
+				# Execute the _post functions
 				if [ "$(command -v "$1_post")" = "$1_post" ]
 				then
 					"$1"_post || exit $?
 				fi
+
 				shift
 				continue 2
 			else