Date: Tue, 1 Dec 2015 13:20:21 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291582 - head/etc/rc.d Message-ID: <201512011320.tB1DKLhG049480@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Tue Dec 1 13:20:21 2015 New Revision: 291582 URL: https://svnweb.freebsd.org/changeset/base/291582 Log: Load our configuration before setting defaults, so local_unbound_workdir actually has an effect. PR: 204931 Submitted by: Eugene Grosbein <eugen@grosbein.net> MFC after: 1 week Modified: head/etc/rc.d/local_unbound Modified: head/etc/rc.d/local_unbound ============================================================================== --- head/etc/rc.d/local_unbound Tue Dec 1 12:37:04 2015 (r291581) +++ head/etc/rc.d/local_unbound Tue Dec 1 13:20:21 2015 (r291582) @@ -24,6 +24,8 @@ configtest_cmd="local_unbound_configtest setup_cmd="local_unbound_setup" pidfile="/var/run/${name}.pid" +load_rc_config $name + : ${local_unbound_workdir:=/var/unbound} : ${local_unbound_config:=${local_unbound_workdir}/unbound.conf} : ${local_unbound_flags:="-c ${local_unbound_config}"} @@ -32,8 +34,6 @@ pidfile="/var/run/${name}.pid" : ${local_unbound_anchor:=${local_unbound_workdir}/root.key} : ${local_unbound_forwarders:=} -load_rc_config $name - do_as_unbound() { echo "$@" | su -m unbound
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512011320.tB1DKLhG049480>