Browse Source

Replace test command with [].

OK halex@ krw@
OPENBSD_5_8
rpe 9 years ago
parent
commit
0dbfdf1513
2 changed files with 11 additions and 12 deletions
  1. +6
    -7
      src/etc/netstart
  2. +5
    -5
      src/etc/rc

+ 6
- 7
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $OpenBSD: netstart,v 1.148 2015/07/19 01:37:45 rpe Exp $
# $OpenBSD: netstart,v 1.149 2015/07/19 04:44:36 rpe Exp $
# Strip comments (and leading/trailing whitespace if IFS is set) from a file
# and spew to stdout.
@ -132,19 +132,18 @@ ifmstart() {
for hn in /etc/hostname.*; do
# Strip off /etc/hostname. prefix.
if=${hn#/etc/hostname.}
test "$if" = "*" && continue
[ "$if" = "*" ] && continue
# Skip unwanted ifs.
s=""
for xf in $2; do
test "$xf" = "${if%%[0-9]*}" && s="1" && break
[ "$xf" = "${if%%[0-9]*}" ] && s="1" && break
done
test "$s" = "1" && continue
[ "$s" = "1" ] && continue
# Start wanted ifs.
test "$sif" = "ALL" -o \
"$sif" = "${if%%[0-9]*}" \
&& ifstart $if
[ "$sif" = "ALL" -o "$sif" = "${if%%[0-9]*}" ] &&
ifstart $if
done
done
}


+ 5
- 5
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.452 2015/07/18 21:12:40 rpe Exp $
# $OpenBSD: rc,v 1.453 2015/07/19 04:44:36 rpe Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@ -16,7 +16,7 @@ stripcom() {
{
while read _line ; do
_line=${_line%%#*} # strip comments
test -z "$_line" && continue
[ -z "$_line" ] && continue
echo $_line
done
} <$_file
@ -53,7 +53,7 @@ update_limit() {
# Apply sysctl(8) settings.
sysctl_conf() {
test -s /etc/sysctl.conf || return
[ -s /etc/sysctl.conf ] || return
# delete comments and blank lines
set -- `stripcom /etc/sysctl.conf`
@ -74,7 +74,7 @@ sysctl_conf() {
# Apply mixerctl(1) settings.
mixerctl_conf() {
test -s /etc/mixerctl.conf || return
[ -s /etc/mixerctl.conf ] || return
# delete comments and blank lines
set -- `stripcom /etc/mixerctl.conf`
@ -88,7 +88,7 @@ mixerctl_conf() {
wsconsctl_conf() {
local save_IFS="$IFS"
test -x /sbin/wsconsctl -a -s /etc/wsconsctl.conf || return
[ -x /sbin/wsconsctl -a -s /etc/wsconsctl.conf ] || return
# delete comments and blank lines
IFS="
"


Loading…
Cancel
Save