From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-849737-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id DD7891384B4
for <garchives@archives.gentoo.org>; Wed, 2 Dec 2015 21:46:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9342A21C061;
Wed, 2 Dec 2015 21:46: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 2FC2921C061
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Dec 2015 21:46:14 +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 C796D340924
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Dec 2015 21:46:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 38457A50
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Dec 2015 21:46:10 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
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" <williamh@gentoo.org>
Message-ID: <1449092675.f5cf1136e70502ee530f20f0434f312611b12b51.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: f5cf1136e70502ee530f20f0434f312611b12b51
X-VCS-Branch: master
Date: Wed, 2 Dec 2015 21:46:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ab704a82-ac8c-40ed-8838-525b0698a768
X-Archives-Hash: d7a6315722dcdda08d81b730db50727a
commit: f5cf1136e70502ee530f20f0434f312611b12b51
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Dec 2 21:44:35 2015 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 2 21:44:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f5cf1136
Use systype variable for rc_sys call
src/rc/rc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/rc/rc.c b/src/rc/rc.c
index d96aa45..8f69333 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -752,6 +752,7 @@ main(int argc, char **argv)
{
const char *bootlevel = NULL;
char *newlevel = NULL;
+ const char *systype = NULL;
static RC_STRINGLIST *hotplugged_services;
static RC_STRINGLIST *stop_services;
static RC_STRINGLIST *start_services;
@@ -845,9 +846,9 @@ main(int argc, char **argv)
eerrorx("%s: %s", applet, strerror(errno));
/* NOTREACHED */
case 'S':
- bootlevel = rc_sys();
- if (bootlevel)
- printf("%s\n", bootlevel);
+ systype = rc_sys();
+ if (systype)
+ printf("%s\n", systype);
exit(EXIT_SUCCESS);
/* NOTREACHED */
case_RC_COMMON_GETOPT