diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/service | |
parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
download | src-test2-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-test2-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
Diffstat (limited to 'usr.sbin/service')
-rw-r--r-- | usr.sbin/service/service.8 | 2 | ||||
-rwxr-xr-x | usr.sbin/service/service.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index 0c2b2d30c912..81d24a035c4a 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -132,4 +132,4 @@ utility first appeared in .Sh AUTHORS This manual page was written by -.An Douglas Barton <dougb@FreeBSD.org> . +.An Douglas Barton Aq Mt dougb@FreeBSD.org . 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 |