| 1 |
commit: c068762c4cf49e7ea9719dcab2e5f7d4c4e7e2e5 |
| 2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 29 20:20:52 2015 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 29 23:05:32 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c068762c |
| 7 |
|
| 8 |
Fix rc_verbose processing |
| 9 |
|
| 10 |
We were processing the rc_verbose setting before we sourced the |
| 11 |
configuration file where it was set; this fixes the issue. |
| 12 |
|
| 13 |
Fixes #46 |
| 14 |
|
| 15 |
sh/runscript.sh.in | 10 ++++++---- |
| 16 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in |
| 19 |
index 06d51d0..4c47260 100644 |
| 20 |
--- a/sh/runscript.sh.in |
| 21 |
+++ b/sh/runscript.sh.in |
| 22 |
@@ -189,10 +189,6 @@ status() |
| 23 |
} |
| 24 |
|
| 25 |
yesno $RC_DEBUG && set -x |
| 26 |
-if yesno "${rc_verbose:-$RC_VERBOSE}"; then |
| 27 |
- EINFO_VERBOSE=yes |
| 28 |
- export EINFO_VERBOSE |
| 29 |
-fi |
| 30 |
|
| 31 |
_conf_d=${RC_SERVICE%/*}/../conf.d |
| 32 |
# If we're net.eth0 or openvpn.work then load net or openvpn config |
| 33 |
@@ -213,6 +209,12 @@ unset _conf_d |
| 34 |
# Load any system overrides |
| 35 |
sourcex -e "@SYSCONFDIR@/rc.conf" |
| 36 |
|
| 37 |
+# Set verbose mode |
| 38 |
+if yesno "${rc_verbose:-$RC_VERBOSE}"; then |
| 39 |
+ EINFO_VERBOSE=yes |
| 40 |
+ export EINFO_VERBOSE |
| 41 |
+fi |
| 42 |
+ |
| 43 |
for _cmd; do |
| 44 |
if [ "$_cmd" != status -a "$_cmd" != describe ]; then |
| 45 |
# Apply any ulimit defined |
Archives