While on death-row, 'rcctl status' still is still allowed for now -- so
authorajacoutot <ajacoutot@openbsd.org>
Tue, 6 Jan 2015 12:49:55 +0000 (12:49 +0000)
committerajacoutot <ajacoutot@openbsd.org>
Tue, 6 Jan 2015 12:49:55 +0000 (12:49 +0000)
make its output match the older one.

usr.sbin/rcctl/rcctl.sh

index 60019f9..62f941b 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: rcctl.sh,v 1.57 2015/01/06 12:27:42 ajacoutot Exp $
+# $OpenBSD: rcctl.sh,v 1.58 2015/01/06 12:49:55 ajacoutot Exp $
 #
 # Copyright (c) 2014, 2015 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -424,7 +424,7 @@ case ${action} in
                        svc_get ${svc} status
                else
                        for i in $(ls_rcscripts) ${_special_services}; do
-                               svc_get ${i}
+                               svc_get ${i} | grep -Ev '_(timeout|user)'
                        done
                        return 0 # we do not want the "status"
                fi