From owner-svn-src-head@freebsd.org  Tue Feb 13 16:07:40 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 484CBF0CA92;
 Tue, 13 Feb 2018 16:07:40 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E9CE0802E2;
 Tue, 13 Feb 2018 16:07:39 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E48C322F7A;
 Tue, 13 Feb 2018 16:07:39 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1DG7dtB050208;
 Tue, 13 Feb 2018 16:07:39 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DG7dta050207;
 Tue, 13 Feb 2018 16:07:39 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201802131607.w1DG7dta050207@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 13 Feb 2018 16:07:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r329218 - head/etc/rc.d
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/etc/rc.d
X-SVN-Commit-Revision: 329218
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Feb 2018 16:07:40 -0000

Author: brd (doc,ports committer)
Date: Tue Feb 13 16:07:39 2018
New Revision: 329218
URL: https://svnweb.freebsd.org/changeset/base/329218

Log:
  Fix resolv to run when it should and not when it should not..
  
  Approved by:	manu
  Reported by:	manu
  Pointy hat to:	brd

Modified:
  head/etc/rc.d/resolv

Modified: head/etc/rc.d/resolv
==============================================================================
--- head/etc/rc.d/resolv	Tue Feb 13 15:55:31 2018	(r329217)
+++ head/etc/rc.d/resolv	Tue Feb 13 16:07:39 2018	(r329218)
@@ -34,12 +34,11 @@
 . /etc/rc.subr
 
 name="resolv"
+rcvar="resolv_enable"
 desc="Create /etc/resolv.conf from kenv"
 start_cmd="${name}_start"
 stop_cmd=':'
 
-load_rc_config $name
-
 # if the info is available via dhcp/kenv
 # build the resolv.conf
 #
@@ -60,3 +59,5 @@ resolv_start()
 	fi
 }
 
+load_rc_config $name
+run_rc_command "$1"