From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFEwG-0002Mh-V0 for garchives@archives.gentoo.org; Thu, 28 Apr 2011 00:18:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D4211C009; Thu, 28 Apr 2011 00:18:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B5EE31C009 for ; Thu, 28 Apr 2011 00:18:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 355801B4070 for ; Thu, 28 Apr 2011 00:18:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 49A4780505 for ; Thu, 28 Apr 2011 00:18:26 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <04e256e3b82ed36f61c375d83f8631a7b58bf28c.williamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/librc/librc.c X-VCS-Directories: src/librc/ X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 04e256e3b82ed36f61c375d83f8631a7b58bf28c Date: Thu, 28 Apr 2011 00:18:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5b9ccf0c8ac3299800f7d0922b3ec0ae commit: 04e256e3b82ed36f61c375d83f8631a7b58bf28c Author: William Hubbs gmail com> AuthorDate: Wed Apr 27 19:46:59 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Apr 27 19:46:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D04e256e3 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=3D360013 --- 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) =20 -#define OPTSTR ". '%s'; echo $opts" +#define OPTSTR ". '%s'; echo $extra_commands $extra_started_commands" RC_STRINGLIST * rc_service_extra_commands(const char *service) {