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 0BD5758973 for ; Tue, 19 Jan 2016 06:12:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1BC021C10A; 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 02D6321C10B for ; Tue, 19 Jan 2016 06:12:24 +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 47CA53409E2 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 DDD76102B 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.62b49b2a3ad1c13012305b4d7281d7f6543c70d7.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/rc.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 62b49b2a3ad1c13012305b4d7281d7f6543c70d7 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: 3007c94d-b455-4503-baf9-75ea870d38d7 X-Archives-Hash: aa3ed7792100c7b90b85744187844298 commit: 62b49b2a3ad1c13012305b4d7281d7f6543c70d7 Author: Doug Freed mtu edu> AuthorDate: Mon Jan 18 06:57:26 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=62b49b2a rc: remove use of magic constant and allow OpenVZ to drop to shell OpenVZ has had console support for a long time now; allow them to use it to drop to a shell during interactive boot. src/rc/rc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rc/rc.c b/src/rc/rc.c index 1aae45f..7836341 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -283,9 +283,8 @@ open_shell(void) #ifdef __linux__ const char *sys = rc_sys(); - /* VSERVER and OPENVZ systems cannot really drop to shells */ - if (sys && - (strcmp(sys, "VSERVER") == 0 || strcmp(sys, "OPENVZ") == 0)) + /* VSERVER systems cannot really drop to shells */ + if (sys && strcmp(sys, RC_SYS_VSERVER) == 0) { execl("/sbin/halt", "/sbin/halt", "-f", (char *) NULL); eerrorx("%s: unable to exec `/sbin/halt': %s",