diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2010-12-27 14:49:05 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2010-12-27 14:49:05 +0000 |
| commit | e8e940ee7602c3aa1591b0f22110b165eabb1fe3 (patch) | |
| tree | a3da7220497deb7f62d24edcd870992a45ee9872 | |
| parent | Properly initialize MXCSR and XMM registers if we only write the x87 FPU state (diff) | |
| download | wireguard-openbsd-e8e940ee7602c3aa1591b0f22110b165eabb1fe3.tar.xz wireguard-openbsd-e8e940ee7602c3aa1591b0f22110b165eabb1fe3.zip | |
There is no point in calling rc_conf manually from each and every rc
script; instead, rc.subr can call rc_conf itself right after reading in
rc.conf.
from schwarze@ (committing on his behalf)
ok robert@
| -rw-r--r-- | etc/rc.d/rc.subr | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index cab274d6406..1a0f46fc257 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,6 +1,4 @@ -# $OpenBSD: rc.subr,v 1.15 2010/12/24 10:37:24 ajacoutot Exp $ - -[ -z "${local_rcconf}" ] && . /etc/rc.conf +# $OpenBSD: rc.subr,v 1.16 2010/12/27 14:49:05 ajacoutot Exp $ rc_err() { echo $1 @@ -80,3 +78,6 @@ rc_cmd() { rc_err "usage: $0 {start|check|reload|restart|stop}" esac } + +[ -z "${local_rcconf}" ] && . /etc/rc.conf +rc_conf |