From f1951eea3fc44410f7ef1876e73eb1500226f8e7 Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Fri, 26 Feb 2021 18:29:16 +0000
Subject: [PATCH] Ship resolvd service, enable it by default

Starting right after unwind.

OK deraadt
---
 etc/rc           |  4 ++--
 etc/rc.conf      |  3 ++-
 etc/rc.d/resolvd | 11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 etc/rc.d/resolvd

diff --git a/etc/rc b/etc/rc
index c55d4dac41b..7b57d2f74e3 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.546 2021/02/26 17:18:41 florian Exp $
+#	$OpenBSD: rc,v 1.547 2021/02/26 18:29:16 kn Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -454,7 +454,7 @@ sh /etc/netstart
 mount -s /usr >/dev/null 2>&1
 mount -s /var >/dev/null 2>&1
 
-start_daemon unwind >/dev/null 2>&1
+start_daemon unwind resolvd >/dev/null 2>&1
 
 # Load pf rules and bring up pfsync interface.
 if [[ $pf != NO ]]; then
diff --git a/etc/rc.conf b/etc/rc.conf
index 2a8180669c9..3596f7fd30f 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.221 2021/02/26 17:18:41 florian Exp $
+#	$OpenBSD: rc.conf,v 1.222 2021/02/26 18:29:16 kn Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -52,6 +52,7 @@ radiusd_flags=NO
 rarpd_flags=NO
 rbootd_flags=NO
 relayd_flags=NO
+resolvd_flags=
 ripd_flags=NO
 route6d_flags=NO	# be sure to set net.inet6.ip6.forwarding=1
 sasyncd_flags=NO
diff --git a/etc/rc.d/resolvd b/etc/rc.d/resolvd
new file mode 100644
index 00000000000..0887d656111
--- /dev/null
+++ b/etc/rc.d/resolvd
@@ -0,0 +1,11 @@
+#!/bin/ksh
+#
+# $OpenBSD: resolvd,v 1.1 2021/02/26 18:29:16 kn Exp $
+
+daemon="/sbin/resolvd"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1
-- 
2.20.1