[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
PR #1764 Solution
- To: bugs@openbsd.org
- Subject: PR #1764 Solution
- From: Jeff Bachtel <jeffb@isc.tamu.edu>
- Date: Fri, 11 May 2001 18:30:02 -0500
- Content-Disposition: inline
- User-Agent: Mutt/1.2.5i
Diff to source /etc/rc.conf.local
I'm not enough of a gnats expert to have this appended automatically
to the PR, sorry for spam.
jeff
--
Jeff Bachtel | http://www.isc.tamu.edu/~jeffb
Systems Administrator, Insitute for Scientific Computing, TAMU
--- /usr/sbin/ndc Sat Apr 28 14:21:09 2001
+++ ndc.new Fri May 11 18:26:10 2001
@@ -12,7 +12,11 @@
NAMED_CMD=named
RUNNING=0
if [ -r /etc/rc.conf ]; then
- CHROOTDIR=`. /etc/rc.conf ; echo "$named_chroot"`
+ if [ -r /etc/rc.conf.local ]; then
+ CHROOTDIR=`. /etc/rc.conf ; . /etc/rc.conf.local ; echo "$named_chroot"`
+ else
+ CHROOTDIR=`. /etc/rc.conf ; echo "$named_chroot"`
+ fi
if [ "X${CHROOTDIR}" != "X" ]; then
NAMED_CMD="${NAMED_CMD} -t ${CHROOTDIR}"
else
@@ -20,12 +24,20 @@
CHROOTDIR=/var/named
fi
- NAMED_USER=`. /etc/rc.conf ; echo "$named_user"`
+ if [ -r /etc/rc.conf.local ]; then
+ NAMED_USER=`. /etc/rc.conf ; . /etc/rc.conf.local ; echo "$named_user"`
+ else
+ NAMED_USER=`. /etc/rc.conf ; echo "$named_user"`
+ fi
if [ "X${NAMED_USER}" != "X" ]; then
NAMED_CMD="${NAMED_CMD} -u ${NAMED_USER}"
fi
- NAMED_FLAGS=`. /etc/rc.conf ; echo "$named_flags"`
+ if [ -r /etc/rc.conf.local ]; then
+ NAMED_FLAGS=`. /etc/rc.conf ; . /etc/rc.conf.local ; echo "$named_flags"`
+ else
+ NAMED_FLAGS=`. /etc/rc.conf ; echo "$named_flags"`
+ fi
if [ "X${NAMED_FLAGS}" != "X" ]; then
NAMED_CMD="${NAMED_CMD} ${NAMED_FLAGS}"
fi