From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RzfAy-0007kZ-7M for garchives@archives.gentoo.org; Tue, 21 Feb 2012 02:09:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C751E0AA6; Tue, 21 Feb 2012 02:09:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 66E67E0AA6 for ; Tue, 21 Feb 2012 02:09:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C86411B400D for ; Tue, 21 Feb 2012 02:09:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6A62E53FF for ; Tue, 21 Feb 2012 02:09:43 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1329789897.04db6c3d39f1c2e81e7d6d98f17388e2003bc17f.WilliamH@gentoo> 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: 04db6c3d39f1c2e81e7d6d98f17388e2003bc17f X-VCS-Branch: master Date: Tue, 21 Feb 2012 02:09:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 980ab1c4-fbed-4bec-bab9-223fb749f807 X-Archives-Hash: fdd27f95419925097652b8a723045ca8 commit: 04db6c3d39f1c2e81e7d6d98f17388e2003bc17f Author: William Hubbs gentoo org> AuthorDate: Tue Feb 21 02:04:57 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Feb 21 02:04:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D04db6c3d rc: remove calls to rc_sys_v2 and rc_sys_v1 These separate calls are no longer needed since we do not warn about falling back to automatic detection. --- src/rc/rc.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/rc/rc.c b/src/rc/rc.c index 40b6293..4cf0374 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -826,15 +826,9 @@ main(int argc, char **argv) eerrorx("%s: %s", applet, strerror(errno)); /* NOTREACHED */ case 'S': - if (rc_conf_value("rc_sys")) { - bootlevel =3D rc_sys_v2(); - if (bootlevel) - printf("%s\n", bootlevel); - } else { - bootlevel =3D rc_sys_v1(); - if (bootlevel) - printf("%s\n", bootlevel); - } + bootlevel =3D rc_sys(); + if (bootlevel) + printf("%s\n", bootlevel); exit(EXIT_SUCCESS); /* NOTREACHED */ case_RC_COMMON_GETOPT