From owner-svn-src-all@FreeBSD.ORG  Tue Jul  1 15:50:34 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC3713C1;
 Tue,  1 Jul 2014 15:50:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A93C52F90;
 Tue,  1 Jul 2014 15:50:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61FoYaW048034;
 Tue, 1 Jul 2014 15:50:34 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61FoYpj048033;
 Tue, 1 Jul 2014 15:50:34 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201407011550.s61FoYpj048033@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 1 Jul 2014 15:50:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r268098 - stable/10/usr.sbin/service
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jul 2014 15:50:34 -0000

Author: delphij
Date: Tue Jul  1 15:50:34 2014
New Revision: 268098
URL: http://svnweb.freebsd.org/changeset/base/268098

Log:
  MFC r267493:
  
  Fix two issues:
  
   - Check for rc.d directory's existence before traversing
     it;
   - Don't output * when rc.d directory is empty.
  
  PR:		bin/190665
  Submitted by:	Oleg Ginzburg <olevole olevole ru> (with changes)

Modified:
  stable/10/usr.sbin/service/service.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/service/service.sh
==============================================================================
--- stable/10/usr.sbin/service/service.sh	Tue Jul  1 15:36:05 2014	(r268097)
+++ stable/10/usr.sbin/service/service.sh	Tue Jul  1 15:50:34 2014	(r268098)
@@ -109,7 +109,7 @@ fi
 if [ -n "$LIST" ]; then
 	for dir in /etc/rc.d $local_startup; do
 		[ -n "$VERBOSE" ] && echo "From ${dir}:"
-		cd $dir && for file in *; do echo $file; done
+		[ -d ${dir} ] && /bin/ls -1 ${dir}
 	done
 	exit 0
 fi