--- a/functions	2008-05-23 21:19:41.000000000 +0200
+++ b/functions	2008-05-23 21:43:52.000000000 +0200
@@ -151,6 +151,19 @@
 	done
 }
 
+start_daemon() {
+	/etc/rc.d/$1 start
+}
+
+start_daemon_bkgd() {
+	stat_bkgd "Starting $1"
+	(/etc/rc.d/$1 start) &>/dev/null &
+}
+
+stop_daemon() {
+	/etc/rc.d/$1 stop
+}
+
 #Source additional functions at the end to allow overrides
 if [ -d /etc/rc.d/functions.d/ ]; then
 	for f in $(/bin/ls /etc/rc.d/functions.d/); do
--- a/rc.multi	2008-05-23 21:19:41.000000000 +0200
+++ b/rc.multi	2008-05-23 21:44:27.000000000 +0200
@@ -13,10 +13,9 @@
 for daemon in "${DAEMONS[@]}"; do
 	if [ "$daemon" = "${daemon#!}" ]; then
 		if [ "$daemon" = "${daemon#@}" ]; then
-			/etc/rc.d/$daemon start
+			start_daemon $daemon
 		else
-			stat_bkgd "Starting ${daemon:1}"
-			(/etc/rc.d/${daemon:1} start) &>/dev/null &
+			start_daemon_bkgd ${daemon:1}
 		fi
 	fi
 done
--- a/rc.shutdown	2008-05-14 13:49:16.000000000 +0200
+++ b/rc.shutdown	2008-05-23 21:47:14.000000000 +0200
@@ -27,14 +27,14 @@
 	let i=${#DAEMONS[@]}
 	while [ $i -ge 0 ]; do
 		if [ "${DAEMONS[$i]:0:1}" != '!' ]; then
-			ck_daemon ${DAEMONS[$i]#@} || /etc/rc.d/${DAEMONS[$i]#@} stop
+			ck_daemon ${DAEMONS[$i]#@} || stop_daemon ${DAEMONS[$i]#@}
 		fi
 		let i=i-1
 	done
 	# find any leftover daemons and shut them down in reverse order
 	if [ -d /var/run/daemons ]; then
 		for daemon in $(/bin/ls -1t /var/run/daemons); do
-			/etc/rc.d/$daemon stop
+			stop_daemon $daemon
 		done
 	fi
 fi