Disambiguate "autoconf" handling now that it is used for IPv4 as well

This was the last mention of "dhcp" in our manuals except for
hostname.if(5) documenting it as an "inet autoconf" alias;  everything has
been converted to modern syntax now (hopefully).

OK jmc

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index c4ff645..6c1998b 100644 (file)
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#      $OpenBSD: install.sub,v 1.1179 2021/10/17 02:05:40 kn Exp $
+#      $OpenBSD: install.sub,v 1.1180 2021/10/17 13:20:46 kn Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2479,7 +2479,7 @@ enable_network() {
 
        # /mnt/etc/mygate, if it exists, contains the address(es) of my
        # default gateway(s). Use for ipv4 if no interfaces configured via
-       # dhcp. Use for ipv6 if no interfaces configured via autoconf.
+       # autoconf. Use for ipv6 if no interfaces configured via autoconf.
        stripcom /mnt/etc/mygate |
        while read _gw; do
                case $_gw in

diff --git a/share/man/man5/mygate.5 b/share/man/man5/mygate.5
index fff8525..152b2ee 100644 (file)
--- a/share/man/man5/mygate.5
+++ b/share/man/man5/mygate.5
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: mygate.5,v 1.1 2020/11/29 20:14:06 deraadt Exp $
+.\"    $OpenBSD: mygate.5,v 1.2 2021/10/17 13:20:46 kn Exp $
 .\"
 .\" Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 29 2020 $
+.Dd $Mdocdate: October 17 2021 $
 .Dt MYGATE 5
 .Os
 .Sh NAME
@@ -50,13 +50,13 @@ is processed after all interfaces have been configured.
 If any
 .Xr hostname.if 5
 files contain
-.Dq dhcp
+.Dq inet autoconf
 directives,
 IPv4 entries in
 .Pa /etc/mygate
 will be ignored.
 If they contain
-.Dq autoconf
+.Dq inet6 autoconf
 directives,
 IPv6 entries will be ignored.
 .Pp