[gentoo-commits] proj/openrc:master commit in: src/librc/

[William Hubbs]

commit:     04e256e3b82ed36f61c375d83f8631a7b58bf28c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Apr 27 19:46:59 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 19:46:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=04e256e3

fix list returned by rc_service_extra_commands

This function was returning the setting of the variable $opts, which is
not correct. $opts was used in baselayout-1, but it is replaced by
$extra_commands and $extra_started_commands in openrc.

This does not appear to break backward compatibility since this function
does not appear to be used anywhere in the openrc code.

Thanks to James Le Cuirot for the original patch.

X-Gentoo-Bug: 360013
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=360013

---
 src/librc/librc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/librc/librc.c b/src/librc/librc.c
index e134547..f2f694d 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -525,7 +525,7 @@ rc_service_exists(const char *service)
 }
 librc_hidden_def(rc_service_exists)
 
-#define OPTSTR ". '%s'; echo $opts"
+#define OPTSTR ". '%s'; echo $extra_commands $extra_started_commands"
 RC_STRINGLIST *
 rc_service_extra_commands(const char *service)
 {