Browse Source

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@
OPENBSD_5_3
ajacoutot 12 years ago
parent
commit
df8fd41267
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      src/etc/rc.d/rc.subr

+ 2
- 2
src/etc/rc.d/rc.subr View File

@ -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"


Loading…
Cancel
Save