diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2016-04-01 08:18:58 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2016-04-01 08:18:58 +0000 |
| commit | 168b3e2e80bd597980ec4f8e738c0313c611c4c6 (patch) | |
| tree | 71b81949c36f46cde288254da0a29c13efbf0aa2 /usr.sbin/rcctl | |
| parent | 7f88e8a1145005d28a460f2914f94ddafb77112e (diff) | |
Rename the 'faulty' list action to 'failed'; it clearer.
prodded by matthieu@
ok millert@ jung@ sthen@
Diffstat (limited to 'usr.sbin/rcctl')
| -rw-r--r-- | usr.sbin/rcctl/rcctl.8 | 8 | ||||
| -rw-r--r-- | usr.sbin/rcctl/rcctl.sh | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/rcctl/rcctl.8 b/usr.sbin/rcctl/rcctl.8 index 3dee478eebb..b763565940d 100644 --- a/usr.sbin/rcctl/rcctl.8 +++ b/usr.sbin/rcctl/rcctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcctl.8,v 1.30 2016/01/30 18:57:31 ajacoutot Exp $ +.\" $OpenBSD: rcctl.8,v 1.31 2016/04/01 08:18:57 ajacoutot Exp $ .\" .\" Copyright (c) 2014 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 30 2016 $ +.Dd $Mdocdate: April 1 2016 $ .Dt RCCTL 8 .Os .Sh NAME @@ -103,7 +103,7 @@ which can be one of: .Bl -tag -width started -offset indent -compact .It Cm all all services and daemons -.It Cm faulty +.It Cm failed enabled but stopped daemons .It Cm off disabled services and daemons @@ -171,7 +171,7 @@ exits with 0 if the daemon or service is enabled and 1 if it is not. .Nm Cm getdef Ar daemon | service Op Cm status exits with 0 if the daemon or service is enabled by default and 1 if it is not. -.Nm Cm ls faulty +.Nm Cm ls failed exits with 1 if an enabled daemon is not running. Otherwise, the .Nm diff --git a/usr.sbin/rcctl/rcctl.sh b/usr.sbin/rcctl/rcctl.sh index 1bed2a599f7..aadf65e6392 100644 --- a/usr.sbin/rcctl/rcctl.sh +++ b/usr.sbin/rcctl/rcctl.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: rcctl.sh,v 1.91 2016/03/28 08:10:19 ajacoutot Exp $ +# $OpenBSD: rcctl.sh,v 1.92 2016/04/01 08:18:57 ajacoutot Exp $ # # Copyright (c) 2014, 2015 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -31,7 +31,7 @@ usage() "usage: rcctl get|getdef|set service | daemon [variable [arguments]] rcctl [-df] $(echo ${_rc_actions} | tr "[:blank:]" "|") daemon ... rcctl disable|enable|order [daemon ...] - rcctl ls all|faulty|off|on|started|stopped" + rcctl ls all|failed|off|on|started|stopped" } needs_root() @@ -182,7 +182,7 @@ svc_ls() echo ${_special_svcs} | tr "[:blank:]" "\n" ) | sort ;; - faulty) + failed) for _svc in $(svc_ls on); do ! svc_is_special ${_svc} && \ ! /etc/rc.d/${_svc} check >/dev/null && \ @@ -444,7 +444,7 @@ ret=0 case ${action} in ls) lsarg=$2 - [[ ${lsarg} == @(all|faulty|off|on|started|stopped) ]] || usage + [[ ${lsarg} == @(all|failed|off|on|started|stopped) ]] || usage ;; order) shift 1 @@ -529,7 +529,7 @@ case ${action} in ;; ls) # some rc.d(8) scripts need root for rc_check() - [[ ${lsarg} == @(started|stopped|faulty) ]] && needs_root ${action} ${lsarg} + [[ ${lsarg} == @(started|stopped|failed) ]] && needs_root ${action} ${lsarg} svc_ls ${lsarg} ;; order) |