From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 24E5A138010 for ; Fri, 5 Oct 2012 03:28:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20F94E0384; Fri, 5 Oct 2012 03:28:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2C4A2E0384 for ; Fri, 5 Oct 2012 03:28:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63A2233C2E1 for ; Fri, 5 Oct 2012 03:28:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 102E8E5436 for ; Fri, 5 Oct 2012 03:28:36 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1349406093.361f5ce2b82765aa38a16abaeb92c475220336d3.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/librc/librc-depend.c X-VCS-Directories: src/librc/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 361f5ce2b82765aa38a16abaeb92c475220336d3 X-VCS-Branch: master Date: Fri, 5 Oct 2012 03:28:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: abd1f268-b8f1-42ae-88c6-05e1587bb29a X-Archives-Hash: 465483bac7c9a5c751721393511d69fb commit: 361f5ce2b82765aa38a16abaeb92c475220336d3 Author: William Hubbs gmail com> AuthorDate: Fri Oct 5 03:01:33 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Oct 5 03:01:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=361f5ce2 set the RC_UNAME environment variable when updating dependencies This is needed because the network script uses this variable in the depend() function but it wasn't exported when this was run. Reported-by: gmail.com> --- src/librc/librc-depend.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index 5e99c1b..ac93716 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -28,6 +28,8 @@ * SUCH DAMAGE. */ +#include + #include "librc.h" #define GENDEP RC_LIBEXECDIR "/sh/gendepends.sh" @@ -747,12 +749,15 @@ rc_deptree_update(void) size_t i, k, l; bool retval = true; const char *sys = rc_sys(); + struct utsname uts; /* Some init scripts need RC_LIBEXECDIR to source stuff Ideally we should be setting our full env instead */ if (!getenv("RC_LIBEXECDIR")) setenv("RC_LIBEXECDIR", RC_LIBEXECDIR, 0); + if (uname(&uts) == 0) + setenv("RC_UNAME", uts.sysname, 1); /* Phase 1 - source all init scripts and print dependencies */ if (!(fp = popen(GENDEP, "r"))) return false;