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 4DC9558973 for ; Tue, 19 Jan 2016 19:41:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB94521C02E; Tue, 19 Jan 2016 19:41:15 +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 81EB421C02E for ; Tue, 19 Jan 2016 19:41:10 +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 C0FFE340961 for ; Tue, 19 Jan 2016 19:41:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A168C1069 for ; Tue, 19 Jan 2016 19:41:06 +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: <1453222492.8e16828bd3d97e6b1e40ded616a54cb8a9e7b403.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:0.20.x 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: 8e16828bd3d97e6b1e40ded616a54cb8a9e7b403 X-VCS-Branch: 0.20.x Date: Tue, 19 Jan 2016 19:41:06 +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: 97d742bd-5552-4808-9fde-e76eb726631f X-Archives-Hash: c5919848d56e6699ba2a945923195679 commit: 8e16828bd3d97e6b1e40ded616a54cb8a9e7b403 Author: Doug Freed mtu edu> AuthorDate: Mon Jan 18 06:57:26 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jan 19 16:54:52 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8e16828b 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",