From 816e02405924d915769d5e23fb8af0e7ce02a07c Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 6 Aug 2021 07:06:34 +0000
Subject: [PATCH] As tim@ spotted, a use of V4_AUTOCONF crept in when the
 variable name was actually V4_DHCPCONF from previous use. Rename all of the
 V4_DHCPCONF to V4_AUTOCONF so everything uses the new name. ok and reminder
 about the installer from tb@

---
 distrib/miniroot/install.sub | 8 ++++----
 etc/netstart                 | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 757b95ae469..8a71dc5c132 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.1170 2021/08/02 01:29:26 kn Exp $
+#	$OpenBSD: install.sub,v 1.1171 2021/08/06 07:06:34 sthen Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2386,7 +2386,7 @@ parse_hn_line() {
 		;;
 	dhcp)	! $_has_dhcp && return
 		_cmds[${#_cmds[*]}]="ifconfig $_if inet autoconf"
-		V4_DHCPCONF=true
+		V4_AUTOCONF=true
 		;;
 	'!'*|bridge)
 		# Skip shell commands and bridge in the installer.
@@ -2482,7 +2482,7 @@ enable_network() {
 			continue
 			;;
 		!(*:*))
-			($_v4set || $V4_DHCPCONF) && continue
+			($_v4set || $V4_AUTOCONF) && continue
 			route -qn add -host default $_gw
 			_v4set=true
 			;;
@@ -3385,7 +3385,7 @@ ROOTDEV=
 ROOTDISK=
 SETDIR="$VNAME/$ARCH"
 UPGRADE_BSDRD=false
-V4_DHCPCONF=false
+V4_AUTOCONF=false
 V6_AUTOCONF=false
 WLANLIST=/tmp/i/wlanlist
 
diff --git a/etc/netstart b/etc/netstart
index 93f2a4e659c..acfe9a21fb2 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.213 2021/07/16 15:21:41 florian Exp $
+#	$OpenBSD: netstart,v 1.214 2021/08/06 07:06:35 sthen Exp $
 
 # Turn off Strict Bourne shell mode.
 set +o sh
@@ -38,7 +38,7 @@ parse_hn_line() {
 	inet)	((${#_c[*]} > 1)) || return
 		if [[ ${_c[_name]} == autoconf ]]; then
 			_cmds[${#_cmds[*]}]="ifconfig $_if ${_c[@]}"
-			V4_DHCPCONF=true
+			V4_AUTOCONF=true
 			return
 		fi
 		[[ ${_c[_name]} == alias ]] && _mask=3 _bc=4
@@ -191,7 +191,7 @@ defaultroute() {
 			_cmd="${_cmd#!}"
 			;;
 		!(*:*))
-			($_v4set || $V4_DHCPCONF) && continue
+			($_v4set || $V4_AUTOCONF) && continue
 			_cmd="route -qn add -host default $gw"
 			_v4set=true
 			;;
@@ -222,7 +222,7 @@ FUNCS_ONLY=1 . /etc/rc.d/rc.subr
 _rc_parse_conf
 
 PRINT_ONLY=false
-V4_DHCPCONF=false
+V4_AUTOCONF=false
 V6_AUTOCONF=false
 
 while getopts ":n" opt; do
-- 
2.20.1