diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-06-15 05:07:01 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-06-15 05:07:01 +0000 |
| commit | 7627c2446ae9a76aefca92d760e980b45d27e7db (patch) | |
| tree | 7538e9225a172ff2f7afab45016da9e22ffc03e6 /usr.sbin/service | |
| parent | 31241fa778bdd484b6aadf313a16fa6d7859914b (diff) | |
| download | src-test2-7627c2446ae9a76aefca92d760e980b45d27e7db.tar.gz src-test2-7627c2446ae9a76aefca92d760e980b45d27e7db.zip | |
Fix two issues:
- Check for rc.d directory's existence before traversing
it;
- Don't output * when rc.d directory is empty.
PR: conf/190665
Submitted by: Oleg Ginzburg <olevole olevole ru> (with changes)
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=267493
Diffstat (limited to 'usr.sbin/service')
| -rwxr-xr-x | usr.sbin/service/service.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index 8c12b8984a7c..b5fd60750d61 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -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 |