diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2015-03-29 15:20:52 -0500 |
|---|---|---|
| committer | Doug Freed <dwfreed@mtu.edu> | 2015-03-29 23:05:32 +0000 |
| commit | c068762c4cf49e7ea9719dcab2e5f7d4c4e7e2e5 (patch) | |
| tree | 3bf0c68de38559517e9a6eb85d2fa520f3363d72 /sh | |
| parent | b8ab99b5d3ee1a93f215157c36fb120857afde64 (diff) | |
Fix rc_verbose processing
We were processing the rc_verbose setting before we sourced the
configuration file where it was set; this fixes the issue.
Fixes #46
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/runscript.sh.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index 06d51d07..4c472603 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -189,10 +189,6 @@ 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 @@ -213,6 +209,12 @@ unset _conf_d # Load any system overrides sourcex -e "@SYSCONFDIR@/rc.conf" +# Set verbose mode +if yesno "${rc_verbose:-$RC_VERBOSE}"; then + EINFO_VERBOSE=yes + export EINFO_VERBOSE +fi + for _cmd; do if [ "$_cmd" != status -a "$_cmd" != describe ]; then # Apply any ulimit defined |