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 9B94658974 for ; Tue, 19 Jan 2016 06:12:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2327521C101; Tue, 19 Jan 2016 06:12:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FF1C21C100 for ; Tue, 19 Jan 2016 06:12:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94F1F3409EC for ; Tue, 19 Jan 2016 06:12:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 455C1CFD for ; Tue, 19 Jan 2016 06:12:20 +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: <1453151371.73482cf13a338051606788957cbd0031ac850c70.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: 73482cf13a338051606788957cbd0031ac850c70 X-VCS-Branch: master Date: Tue, 19 Jan 2016 06:12:20 +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: 25905d5b-b528-4dea-ad7a-e416a0d70623 X-Archives-Hash: 76472667bb82d8e1f0ad10c4360f0b8e commit: 73482cf13a338051606788957cbd0031ac850c70 Author: William Hubbs gmail com> AuthorDate: Mon Jan 18 21:09:31 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Jan 18 21:09:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=73482cf1 librc: fix librc-depend functions to call rc_sys src/librc/librc-depend.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index 991a871..d64b2b2 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -740,7 +740,7 @@ rc_deptree_update(void) char *depend, *depends, *service, *type, *nosys, *onosys; size_t i, k, l; bool retval = true; - const char *sys = NULL; + const char *sys = rc_sys(); struct utsname uts; /* Some init scripts need RC_LIBEXECDIR to source stuff @@ -847,9 +847,6 @@ rc_deptree_update(void) /* Phase 2 - if we're a special system, remove services that don't * work for them. This doesn't stop them from being run directly. */ - sys = detect_container(); - if (!sys) - sys = detect_vm(); if (sys) { len = strlen(sys); nosys = xmalloc(len + 2);