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 11C2B58973 for ; Tue, 19 Jan 2016 06:12:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EE4421C109; Tue, 19 Jan 2016 06:12:24 +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 CF81A21C109 for ; Tue, 19 Jan 2016 06:12:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 279073409D0 for ; Tue, 19 Jan 2016 06:12:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8AF71029 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: <1453183760.36dde4e7f21afba36a96837aa86f2b5d2dae3807.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/librc/librc.c src/librc/rc.h.in X-VCS-Directories: src/librc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 36dde4e7f21afba36a96837aa86f2b5d2dae3807 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: e35e014c-4fca-4114-a8bc-29d62fcfddc2 X-Archives-Hash: 2b31870cde000538122e3cd04b7232f9 commit: 36dde4e7f21afba36a96837aa86f2b5d2dae3807 Author: Doug Freed mtu edu> AuthorDate: Mon Jan 18 06:05:22 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jan 19 06:09:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=36dde4e7 librc: fix handling the nothing special case for rc_sys src/librc/librc.c | 15 +++++++++++++-- src/librc/rc.h.in | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/librc/librc.c b/src/librc/librc.c index 5cf4898..8b4e8d4 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -228,8 +228,13 @@ static const char * detect_container(const char *systype) { #ifdef __FreeBSD__ - if (systype && strcmp(systype, RC_SYS_JAIL) == 0) - return RC_SYS_JAIL; + if (systype) { + if (strcmp(systype, RC_SYS_NONE) == 0) + return NULL; + if (strcmp(systype, RC_SYS_JAIL) == 0) + return RC_SYS_JAIL; + } + int jailed = 0; size_t len = sizeof(jailed); @@ -240,6 +245,8 @@ detect_container(const char *systype) #ifdef __linux__ if (systype) { + if (strcmp(systype, RC_SYS_NONE) == 0) + return NULL; if (strcmp(systype, RC_SYS_UML) == 0) return RC_SYS_UML; if (strcmp(systype, RC_SYS_VSERVER) == 0) @@ -283,6 +290,8 @@ detect_vm(const char *systype) { #ifdef __NetBSD__ if (systype) { + if (strcmp(systype, RC_SYS_NONE) == 0) + return NULL; if (strcmp(systype, RC_SYS_XEN0) == 0) return RC_SYS_XEN0; if (strcmp(systype, RC_SYS_XENU) == 0) @@ -296,6 +305,8 @@ detect_vm(const char *systype) #ifdef __linux__ if (systype) { + if (strcmp(systype, RC_SYS_NONE) == 0) + return NULL; if (strcmp(systype, RC_SYS_XEN0) == 0) return RC_SYS_XEN0; if (strcmp(systype, RC_SYS_XENU) == 0) diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index 55fbc44..92ecbb4 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -318,6 +318,7 @@ bool rc_service_daemons_crashed(const char *); * Some services cannot work in these systems, or we do something else. */ #define RC_SYS_DOCKER "DOCKER" #define RC_SYS_JAIL "JAIL" +#define RC_SYS_NONE "" #define RC_SYS_OPENVZ "OPENVZ" #define RC_SYS_LXC "LXC" #define RC_SYS_PREFIX "PREFIX"