| 1 |
commit: 69ac78d76a31d843c004717eb6aa6a77bb4c9a8e |
| 2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Aug 25 16:04:48 2016 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 25 16:04:48 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=69ac78d7 |
| 7 |
|
| 8 |
openrc-run: make runscript warning respect quiet option |
| 9 |
|
| 10 |
X-Gentoo-Bug: 591414 |
| 11 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=591414 |
| 12 |
|
| 13 |
src/rc/openrc-run.c | 6 +++--- |
| 14 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c |
| 17 |
index ff884c4..e3b4fbb 100644 |
| 18 |
--- a/src/rc/openrc-run.c |
| 19 |
+++ b/src/rc/openrc-run.c |
| 20 |
@@ -1169,9 +1169,6 @@ int main(int argc, char **argv) |
| 21 |
if (argc < 3) |
| 22 |
usage(EXIT_FAILURE); |
| 23 |
|
| 24 |
- if (runscript) |
| 25 |
- ewarn("%s uses runscript, please convert to openrc-run.", service); |
| 26 |
- |
| 27 |
/* Change dir to / to ensure all init scripts don't use stuff in pwd */ |
| 28 |
if (chdir("/") == -1) |
| 29 |
eerror("chdir: %s", strerror(errno)); |
| 30 |
@@ -1291,6 +1288,9 @@ int main(int argc, char **argv) |
| 31 |
applet_list = rc_stringlist_new(); |
| 32 |
rc_stringlist_add(applet_list, applet); |
| 33 |
|
| 34 |
+ if (runscript) |
| 35 |
+ ewarn("%s uses runscript, please convert to openrc-run.", service); |
| 36 |
+ |
| 37 |
/* Now run each option */ |
| 38 |
retval = EXIT_SUCCESS; |
| 39 |
while (optind < argc) { |
Archives