-- rh_status_q || return 0
-+ status $DAEMON 1>/dev/null 2>&1 || return 0
-
- [ -z "$LVM_VGS" ] && LVM_VGS="$(clustered_vgs)"
- if [ -n "$LVM_VGS" ]; then
-- action "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $?
-+ run_cmd "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $?
- fi
-
-- action "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $?
-+ run_cmd "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $?
-
- # wait half second before we start the waiting loop or we will show
- # the loop more time than really necessary
- usleep 500000
-
- # clvmd could take some time to stop
-- rh_status_q && action "Waiting for $DAEMON to exit:" wait_for_finish
--
-- if rh_status_q; then
-- echo -n "$DAEMON failed to exit"
-- failure
-- echo
-+ status $DAEMON 1>/dev/null 2>&1 && run_cmd "Waiting for $DAEMON to exit:" wait_for_finish
-+ if status $DAEMON 1>/dev/null 2>&1; then
-+ fail
- return 1
- else
-- echo -n "$DAEMON terminated"
-- success
-- echo
-+ ok
- fi
--
- rm -f $LOCK_FILE
--
- return 0
- }
-
- reload() {
-- rh_status_q || exit 7
-- action "Reloading $DAEMON configuration: " $DAEMON -R || return $?
-+ status $DAEMON 1>/dev/null 2>&1 || exit 7
-+ run_cmd "Reloading $DAEMON configuration: " $DAEMON -R || return $?
- }
-
- restart() {
- # if stop fails, restart will return the error and not attempt
-- # another start. Even if start is protected by rh_status_q,
-+ # another start. Even if start is protected by status call,
- # that would avoid spawning another daemon, it would try to
- # reactivate the VGs.
-
- # Try to get clvmd to restart itself. This will preserve
- # exclusive LV locks
-- action "Restarting $DAEMON: " $DAEMON -S
-+ run_cmd "Restarting $DAEMON: " $DAEMON -S
-
- # If that fails then do a normal stop & restart
- if [ $? != 0 ]; then
-@@ -166,49 +142,43 @@
- exit 4
- }
-
-+RETVAL=0
- # See how we were called.
- case "$1" in
- start)
- start