From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-564128-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 03414198007
	for <garchives@archives.gentoo.org>; Mon, 25 Feb 2013 20:50:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 846D0E064C;
	Mon, 25 Feb 2013 20:50:53 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 0D058E0665
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Feb 2013 20:50:52 +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 2211033DDCA
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Feb 2013 20:50:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 5CB5DE4086
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Feb 2013 20:50:48 +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: <1361825044.927207c1b793d601344d2bd3c8f3c04cefb6323e.WilliamH@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/
X-VCS-Repository: proj/openrc
X-VCS-Files: src/rc/rc-status.c
X-VCS-Directories: src/rc/
X-VCS-Committer: WilliamH
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 927207c1b793d601344d2bd3c8f3c04cefb6323e
X-VCS-Branch: master
Date: Mon, 25 Feb 2013 20:50:48 +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: 22e719ad-7462-400f-83b2-3170a18c49a1
X-Archives-Hash: 25ba55e7f85674dbc8e3920fd25b1b09

commit:     927207c1b793d601344d2bd3c8f3c04cefb6323e
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 24 17:06:42 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 20:44:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=927207c1

rc-status: improve usage message accuracy and consistency

This makes it more clear that many of the options are used as an
alternative to a runlevel.

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 src/rc/rc-status.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/rc/rc-status.c b/src/rc/rc-status.c
index 04e8bd3..f096851 100644
--- a/src/rc/rc-status.c
+++ b/src/rc/rc-status.c
@@ -172,7 +172,9 @@ print_services(const char *runlevel, RC_STRINGLIST *svcs)
 }
 
 #include "_usage.h"
-#define extraopts "[runlevel1] [runlevel2] ..."
+#define usagestring ""						\
+	"Usage: rc-status [options] <runlevel>...\n"		\
+	"   or: rc-status [options] [-a | -c | -l | -r | -s | -u]"
 #define getoptstring "aclrsu" getoptstring_COMMON
 static const struct option longopts[] = {
 	{"all",         0, NULL, 'a'},