5 files changed, 104 insertions, 54 deletions
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index abc05b618a5..4a54fd3ae6e 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.57 2018/11/21 09:26:02 jmc Exp $
+#	$OpenBSD: Makefile,v 1.58 2020/11/29 20:14:06 deraadt Exp $
 #	$NetBSD: Makefile,v 1.14 1995/05/11 23:13:15 cgd Exp $
 
 MAN=	acct.5 ar.5 bsd.port.mk.5 bsd.port.arch.mk.5 bsd.regress.mk.5 \
@@ -6,7 +6,7 @@ MAN=	acct.5 ar.5 bsd.port.mk.5 bsd.port.arch.mk.5 bsd.regress.mk.5 \
 	defaultdomain.5 dir.5 disktab.5 elf.5 ethers.5 fbtab.5 files.conf.5 \
 	fs.5 fstab.5 genassym.cf.5 group.5 hostname.if.5 hosts.5 installurl.5 \
 	intro.5 login.conf.5 mandoc.db.5 mixerctl.conf.5 \
-	mk.conf.5 moduli.5 motd.5 myname.5 netgroup.5 passwd.5 \
+	mk.conf.5 moduli.5 motd.5 mygate.5 myname.5 netgroup.5 passwd.5 \
 	pf.conf.5 pf.os.5 port-modules.5 printcap.5 protocols.5 \
 	ranlib.5 remote.5 resolv.conf.5 rpc.5 ruby-module.5 \
 	services.5 shells.5 \
diff --git a/share/man/man5/mygate.5 b/share/man/man5/mygate.5
new file mode 100644
index 00000000000..fff85259331
--- /dev/null
+++ b/share/man/man5/mygate.5
@@ -0,0 +1,86 @@
+.\"	$OpenBSD: mygate.5,v 1.1 2020/11/29 20:14:06 deraadt Exp $
+.\"
+.\" Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" 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 $
+.Dt MYGATE 5
+.Os
+.Sh NAME
+.Nm mygate
+.Nd default gateway
+.Sh DESCRIPTION
+The
+.Nm mygate
+file is read by
+.Xr netstart 8
+at system startup time.
+.Pp
+.Pa /etc/mygate ,
+if it exists,
+contains the address of the gateway host.
+The gateway is added to the routing tables by the
+.Xr route 8
+utility.
+If
+.Pa /etc/mygate
+does not exist, no default gateway is added to the routing tables.
+The file may contain gateway addresses for both IPv4 and IPv6 networks
+in dotted quad notation for v4
+.Pq e.g. 192.0.2.1
+or in colon notation for v6
+.Pq e.g. 2001:db8::1 .
+Each address must be specified on a separate line.
+If more than one address of a specific family is found,
+only the first is used \- all other addresses of that family are ignored.
+.Pp
+.Pa /etc/mygate
+is processed after all interfaces have been configured.
+If any
+.Xr hostname.if 5
+files contain
+.Dq dhcp
+directives,
+IPv4 entries in
+.Pa /etc/mygate
+will be ignored.
+If they contain
+.Dq autoconf
+directives,
+IPv6 entries will be ignored.
+.Pp
+Additionally, arbitrary shell commands can be executed during processing
+of this file, using
+.Ar \&! Ns Ar command
+directives similar to
+.Xr hostname.if 5 .
+This is useful for doing additional configuration after all interfaces
+are configured by
+.Xr netstart 8 .
+.Pp
+Empty lines and lines beginning with
+.Sq #
+are ignored.
+.Sh FILES
+.Bl -tag -width "/etc/mygate" -compact
+.It Pa /etc/mygate
+Default gateway address(es).
+.El
+.Sh SEE ALSO
+.Xr hostname.if 5 ,
+.Xr netstart 8 ,
+.Xr route 8
+.Sh HISTORY
+This manual page first appeared in
+.Ox 3.4 .
diff --git a/share/man/man5/myname.5 b/share/man/man5/myname.5
index 6234c637a14..a2dbdabc457 100644
--- a/share/man/man5/myname.5
+++ b/share/man/man5/myname.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: myname.5,v 1.9 2017/07/13 19:16:33 jmc Exp $
+.\"	$OpenBSD: myname.5,v 1.10 2020/11/29 20:14:06 deraadt Exp $
 .\"
 .\" Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org>
 .\"
@@ -14,18 +14,16 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 13 2017 $
+.Dd $Mdocdate: November 29 2020 $
 .Dt MYNAME 5
 .Os
 .Sh NAME
-.Nm myname , mygate
-.Nd default hostname and gateway
+.Nm myname
+.Nd default hostname
 .Sh DESCRIPTION
 The
 .Nm myname
-and
-.Nm mygate
-files are read by
+file is read by
 .Xr netstart 8
 at system startup time.
 .Pp
@@ -50,48 +48,14 @@ See
 .Xr hostname 7
 for a description of hostname resolution.
 .Pp
-.Pa /etc/mygate ,
-if it exists,
-contains the address of the gateway host.
-The gateway is added to the routing tables by the
-.Xr route 8
-utility.
-If
-.Pa /etc/mygate
-does not exist, no default gateway is added to the routing tables.
-The file may contain gateway addresses for both IPv4 and IPv6 networks:
-in dotted quad notation for v4
-.Pq e.g. 192.0.2.1
-or in colon notation for v6
-.Pq e.g. 2001:db8::1 .
-Each address must be specified on a separate line.
-If more than one address of a specific family is found,
-only the first is used \- all other addresses of that family are ignored.
-.Pp
-.Pa /etc/mygate
-is processed after all interfaces have been configured.
-If any
-.Xr hostname.if 5
-files contain
-.Dq dhcp
-directives,
-IPv4 entries in
-.Pa /etc/mygate
-will be ignored.
-If they contain
-.Dq autoconf
-directives,
-IPv6 entries will be ignored.
 .Pp
 Empty lines and lines beginning with
 .Sq #
-in either file are ignored.
+are ignored.
 .Sh FILES
 .Bl -tag -width "/etc/myname" -compact
 .It Pa /etc/myname
 Default hostname.
-.It Pa /etc/mygate
-Default gateway address(es).
 .El
 .Sh SEE ALSO
 .Xr hostname 1 ,
@@ -99,8 +63,7 @@ Default gateway address(es).
 .Xr hosts 5 ,
 .Xr resolv.conf 5 ,
 .Xr hostname 7 ,
-.Xr netstart 8 ,
-.Xr route 8
+.Xr netstart 8
 .Sh HISTORY
 This manual page first appeared in
 .Ox 3.4 .
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index def171b393a..b0a30683882 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: diskless.8,v 1.69 2017/06/11 14:03:46 schwarze Exp $
+.\"	$OpenBSD: diskless.8,v 1.70 2020/11/29 20:14:06 deraadt Exp $
 .\"	$NetBSD: diskless.8,v 1.7.4.1 1996/05/30 18:58:10 cgd Exp $
 .\"
 .\"
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 11 2017 $
+.Dd $Mdocdate: November 29 2020 $
 .Dt DISKLESS 8
 .Os
 .Sh NAME
@@ -395,7 +395,9 @@ Interface-specific configuration file.
 .It Pa /etc/hosts
 Host name database.
 .It Pa /etc/myname
-Default hostname and gateway.
+Default hostname.
+.It Pa /etc/mygate
+Default gateway.
 .It Pa /etc/rbootd.conf
 Configuration file for HP Remote Boot Daemon.
 .It Pa /tftpboot
@@ -411,6 +413,7 @@ Location of boot programs loaded by the HP Boot ROM.
 .Xr fstab 5 ,
 .Xr hostname.if 5 ,
 .Xr hosts 5 ,
+.Xr mygate 5 ,
 .Xr myname 5 ,
 .Xr dhcpd 8 ,
 .Xr mopd 8 ,
diff --git a/share/man/man8/netstart.8 b/share/man/man8/netstart.8
index 0c0d7038ddd..91183376edd 100644
--- a/share/man/man8/netstart.8
+++ b/share/man/man8/netstart.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netstart.8,v 1.24 2020/11/03 06:46:23 jmc Exp $
+.\"	$OpenBSD: netstart.8,v 1.25 2020/11/29 20:14:06 deraadt Exp $
 .\"
 .\" Copyright (c) 2002, Miodrag Vallat.
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: November 3 2020 $
+.Dd $Mdocdate: November 29 2020 $
 .Dt NETSTART 8
 .Os
 .Sh NAME
@@ -58,8 +58,6 @@ performs the following operations, in the sequence given:
 .Pp
 .Bl -bullet -compact -offset indent
 .It
-Set the machine's name.
-.It
 Configure the loopback interface.
 .It
 Configure all physical interfaces.
@@ -108,7 +106,7 @@ without actually configuring the interface.
 .Xr multicast 4 ,
 .Xr defaultdomain 5 ,
 .Xr hostname.if 5 ,
-.Xr myname 5 ,
+.Xr mygate 5 ,
 .Xr ifconfig 8 ,
 .Xr rc 8 ,
 .Xr rc.conf 8