From de60ffeebe93ffdc09c1dda51e04f29485d96cdb Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 11 Sep 2014 12:02:51 -0500 Subject: [PATCH] runscript: move verbose mode setting near debug setting --- sh/runscript.sh.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index 9b2ae0e0..d4c7c60c 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -185,6 +185,10 @@ status() } yesno $RC_DEBUG && set -x +if yesno "${rc_verbose:-$RC_VERBOSE}"; then + EINFO_VERBOSE=yes + export EINFO_VERBOSE +fi _conf_d=${RC_SERVICE%/*}/../conf.d # If we're net.eth0 or openvpn.work then load net or openvpn config @@ -208,12 +212,6 @@ sourcex -e "@SYSCONFDIR@/rc.conf" # Apply any ulimit defined [ -n "${rc_ulimit:-$RC_ULIMIT}" ] && ulimit ${rc_ulimit:-$RC_ULIMIT} -# Set verbose mode -if yesno "${rc_verbose:-$RC_VERBOSE}"; then - EINFO_VERBOSE=yes - export EINFO_VERBOSE -fi - # Apply cgroups settings if defined if [ "$1" = "start" ] ; then if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]; then