diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-06-13 18:29:49 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-06-13 18:29:49 +0000 |
commit | aaa5a47c10ef7b9d0525374cd53c0d4c82f1767b (patch) | |
tree | 5424e868850b1e0ab973bbdec86d8e31a86d805e /etc | |
parent | 0c22751fe5634c5aef00b9f42b47c29ab4ff4958 (diff) |
normalize test vs [; form
Diffstat (limited to 'etc')
-rw-r--r-- | etc/rc | 6 | ||||
-rw-r--r-- | etc/rc.local | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.139 2000/05/19 16:53:17 mickey Exp $ +# $OpenBSD: rc,v 1.140 2000/06/13 18:29:48 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -506,9 +506,9 @@ if [ "X${mopd_flags}" != X"NO" -a -d /tftpboot/mop ]; then fi if [ X"${sshd}" == X"YES" ]; then - if test -x /usr/sbin/sshd && /usr/sbin/sshd -Q ; then + if [ -x /usr/sbin/sshd ] && /usr/sbin/sshd -Q ; then echo -n ' sshd' - elif [ -x /usr/local/sbin/sshd && /usr/local/sbin/sshd ]; then + elif [ -x /usr/local/sbin/sshd ] && /usr/local/sbin/sshd ; then echo -n ' sshd' fi fi diff --git a/etc/rc.local b/etc/rc.local index f91565c5740..85d0efa075d 100644 --- a/etc/rc.local +++ b/etc/rc.local @@ -1,4 +1,4 @@ -# $OpenBSD: rc.local,v 1.27 1999/09/28 07:19:41 deraadt Exp $ +# $OpenBSD: rc.local,v 1.28 2000/06/13 18:29:48 deraadt Exp $ # site-specific startup actions, daemons, and other things which # can be done AFTER your system goes into securemode. For actions @@ -24,7 +24,7 @@ if [ -x /usr/local/sbin/snmpd ]; then fi # set pcvt screen saver time to 5min (see scon(1) for more options) -#if test -x /usr/sbin/ispcvt -a -x /usr/sbin/scon && /usr/sbin/ispcvt; then +#if [ -x /usr/sbin/ispcvt -a -x /usr/sbin/scon ] && /usr/sbin/ispcvt; then # echo -n ' scon'; /usr/sbin/scon -t 300 #fi |