diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2012-11-12 08:07:53 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2012-11-12 08:07:53 +0000 |
| commit | a8f19cb9a7c39d923d3c542afdfdf869a8b698c0 (patch) | |
| tree | a7ff1d8ad7d1a18a5bb8e89d0a34d8748ff17d19 | |
| parent | Once a C_RECVDIR command is sent, a matching C_END command has to be (diff) | |
| download | wireguard-openbsd-a8f19cb9a7c39d923d3c542afdfdf869a8b698c0.tar.xz wireguard-openbsd-a8f19cb9a7c39d923d3c542afdfdf869a8b698c0.zip | |
Don't check if ${local_rcconf} is defined before sourcing rc.conf but do
it unconditionally.
The only place local_rcconf could have been defined is from /etc/rc
sourcing rc.conf but then the variable is not exported so it will never
be seen by rc.subr.
ok robert@
| -rw-r--r-- | etc/rc.d/rc.subr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index 49b89b3e22e..4ab9e9ee6fd 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.65 2012/09/13 05:55:21 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.66 2012/11/12 08:07:53 ajacoutot Exp $ # # Copyright (c) 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -167,7 +167,7 @@ rc_cmd() { esac } -[ -z "${local_rcconf}" ] && . /etc/rc.conf +. /etc/rc.conf [ -n "${daemon}" ] || rc_err "$0: daemon is not set" |