From 2555728f4b6f2e9dbad9f368b59d47c40faf8771 Mon Sep 17 00:00:00 2001
From: florian <florian@openbsd.org>
Date: Fri, 16 Jul 2021 15:21:41 +0000
Subject: [PATCH] switch to dhcpleased/resolvd in base OK deraadt

---
 etc/netstart | 19 +++----------------
 etc/rc.conf  |  6 +++---
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/etc/netstart b/etc/netstart
index eba11f4bbd1..93f2a4e659c 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.212 2021/06/20 08:31:03 florian Exp $
+#	$OpenBSD: netstart,v 1.213 2021/07/16 15:21:41 florian Exp $
 
 # Turn off Strict Bourne shell mode.
 set +o sh
@@ -68,21 +68,8 @@ parse_hn_line() {
 		_c[_name]="${_c[_name]} $_daddr"
 		_cmds[$_prev]="${_c[@]}"
 		;;
-	dhcp)	unset _c[0]
-		_i=1
-		while [[ ${_c[$_i]} == @(-c|-d|-i|-n|-r|-v) ]]; do
-			if [[ ${_c[$_i]} == @(-c|-i) ]]; then
-				_dhcp[${#_dhcp[*]}]=${_c[$_i]}
-				unset _c[$_i]
-				(( _i++ ))
-			fi
-			_dhcp[${#_dhcp[*]}]=${_c[$_i]}
-			unset _c[$_i]
-			(( _i++ ))
-		done
-		((${#_c[*]} > 0)) && _cmds[${#_cmds[*]}]="ifconfig $_if ${_c[@]}"
-		_cmds[${#_cmds[*]}]="dhclient ${_dhcp[@]} $_if"
-		V4_DHCPCONF=true
+	dhcp)	_cmds[${#_cmds[*]}]="ifconfig $_if inet autoconf"
+		V4_AUTOCONF=true
 		;;
 	'!'*)	_cmd=$(print -- "${_c[@]}" | sed 's/\$if/'$_if'/g')
 		_cmds[${#_cmds[*]}]="${_cmd#!}"
diff --git a/etc/rc.conf b/etc/rc.conf
index fa50172c679..66dbc1e0122 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.223 2021/03/01 07:25:07 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.224 2021/07/16 15:21:41 florian Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -18,7 +18,7 @@ bgpd_flags=NO
 bootparamd_flags=NO
 cron_flags=
 dhcpd_flags=NO
-dhcpleased_flags=NO
+dhcpleased_flags=
 dhcrelay_flags=NO	# for normal use: "-i interface [server]"
 dvmrpd_flags=NO
 eigrpd_flags=NO
@@ -52,7 +52,7 @@ radiusd_flags=NO
 rarpd_flags=NO
 rbootd_flags=NO
 relayd_flags=NO
-resolvd_flags=NO
+resolvd_flags=
 ripd_flags=NO
 route6d_flags=NO	# be sure to set net.inet6.ip6.forwarding=1
 sasyncd_flags=NO
-- 
2.20.1