emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rc_verbose processing

Browse Source 
We were processing the rc_verbose setting before we sourced the
configuration file where it was set; this fixes the issue.

Fixes #46
This commit is contained in:
William Hubbs 2015-03-29 15:20:52 -05:00 committed by Doug Freed
parent b8ab99b5d3
commit c068762c4c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sh/runscript.sh.in
View File

@ -189,10 +189,6 @@ status()
} }
yesno $RC_DEBUG && set -x 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 _conf_d=${RC_SERVICE%/*}/../conf.d
# If we're net.eth0 or openvpn.work then load net or openvpn config # 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 # Load any system overrides
sourcex -e "@SYSCONFDIR@/rc.conf" 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 for _cmd; do
if [ "$_cmd" != status -a "$_cmd" != describe ]; then if [ "$_cmd" != status -a "$_cmd" != describe ]; then
# Apply any ulimit defined # Apply any ulimit defined