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 4E97558973 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 22B9C21C100; 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 99CA221C104 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 CE8FC340A13 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 7DE411026 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: <1453182003.6c0942137572608d02eb4b34bad55c9bf418a6ba.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: 6c0942137572608d02eb4b34bad55c9bf418a6ba 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: 730f3404-7e10-4145-9dfa-3629e82864d7 X-Archives-Hash: e41d66c4bd8f3308b29a8299ef610081 commit: 6c0942137572608d02eb4b34bad55c9bf418a6ba Author: William Hubbs gmail com> AuthorDate: Tue Jan 19 05:40:03 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jan 19 05:40:03 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6c094213 Revert "librc: fix librc-depend functions to call rc_sys" This reverts commit 73482cf13a338051606788957cbd0031ac850c70. src/librc/librc-depend.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index d64b2b2..991a871 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 = rc_sys(); + const char *sys = NULL; struct utsname uts; /* Some init scripts need RC_LIBEXECDIR to source stuff @@ -847,6 +847,9 @@ 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);