git: 037902038e68 - stable/13 - rc.d: Put resolv script in FreeBSD-resolvconf

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Thu, 02 Feb 2023 10:53:51 UTC

The branch stable/13 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=037902038e683877be09b043f49e31be32b47cc3

commit 037902038e683877be09b043f49e31be32b47cc3
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-10-28 07:33:38 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 10:41:11 +0000

    rc.d: Put resolv script in FreeBSD-resolvconf
    
    Differential Revision:  https://reviews.freebsd.org/D37190
    
    (cherry picked from commit a6a21bbedc744bae9ce7b20948b53a6d4033adcf)
---
 libexec/rc/rc.d/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index a6ed5b715734..188eae2e2f5b 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -86,7 +86,6 @@ CONFS=	DAEMON \
 	random \
 	rarpd \
 	rctl \
-	resolv \
 	root \
 	route6d \
 	routing \
@@ -127,6 +126,10 @@ CONFGROUPS+=		DHCLIENT
 DHCLIENT=		dhclient
 DHCLIENTPACKAGE=	dhclient
 
+CONFGROUPS+=		RESOLVCONF
+RESOLVCONF=		resolv
+RESOLVCONFPACKAGE=	resolvconf
+
 .if ${MK_NIS} != "no"
 CONFS+=	ypbind \
 	ypldap \