shithub: riscv

Download patch

ref: 63a0d519bcdb02b226023b1c07343bc52791a677
parent: 4e91e4a2dbab9d79e1047cfc2094a438561b5a21
author: cinap_lenrek <[email protected]>
date: Thu Jan 24 15:30:14 EST 2019

dhcpd(8), ndb(6): group related ndb attributes together

--- a/sys/man/6/ndb
+++ b/sys/man/6/ndb
@@ -155,7 +155,7 @@
 A number of attributes are meaningful to programs and thus
 reserved.
 They are:
-.TF dnsdomain
+.TF rootserver
 .TP
 .B sys
 system name (a short name)
@@ -173,46 +173,39 @@
 .L AAAA
 record.
 .TP
+.B ipnet
+Internet network name
+.TP
+.B ipmask
+Internet network mask
+.TP
+.B ipgw
+Internet gateway (ip address)
+.TP
 .B ether
 Ethernet address
-(must be lower-case hexadecimal).
-Beware that for machines with multiple
-.B ether
-attributes,
-.I dhcpd
-may expect requests to come from the address in the first
-.B ether
-attribute.
+(must be lower-case hex)
 .TP
+.B vendor
+Specific vendor attribute for dhcp and bootp
+.TP
 .B bootf
 file to download for initial bootstrap;
 .B /386/9bootpxe
 to boot a PC via PXE.
 .TP
-.B vendor
-Specific vendor attribute for dhcp and bootp
-.TP
-.B rootserver
-used by Unix machines for boot NFS server
-.TP
 .B tftp
 an TFTP server to use for PXE bootstrap
 .TP
-.B ipnet
-Internet network name
+.B fs
+Plan 9 file server to be used
 .TP
-.B ipmask
-Internet network mask
-.TP
-.B ipgw
-Internet gateway (ip address)
-.TP
 .B auth
-authentication server to be used
+Plan 9 authentication server to be used
 .TP
 .B authdom
-authentication domain.  Plan 9 supports multiple authentication
-domains.  To specify an authentication server for a particular domain,
+Plan 9 authentication domain.
+To specify an authentication server for a particular domain,
 add a tuple containing both
 .B auth
 and
@@ -219,32 +212,12 @@
 .B authdom
 attributes and values.
 .TP
-.B fs
-file server to be used
+.B rootpath
+the NFS root for unix machines
 .TP
-.B tcp
-a TCP service name
+.B rootserver
+the NFS server used with rootpath
 .TP
-.B udp
-a UDP service name
-.TP
-.B port
-a TCP or UDP port number
-.TP
-.B restricted
-a TCP service that can be called only by ports numbered
-less than 1024
-.TP
-.B proto
-a protocol supported by a host.
-The pair
-.B proto=il
-was needed by
-.I cs
-(see
-.IR ndb (8))
-in tuples for hosts that supported the IL protocol
-.TP
 .B dnsdomain
 a domain name that
 .I ndb/dns
@@ -283,6 +256,29 @@
 .TP
 .B soa
 start of area (for DNS)
+.TP
+.B tcp
+a TCP service name
+.TP
+.B udp
+a UDP service name
+.TP
+.B port
+a TCP or UDP port number
+.TP
+.B restricted
+a TCP service that can be called only by ports numbered
+less than 1024
+.TP
+.B proto
+a protocol supported by a host.
+The pair
+.B proto=il
+was needed by
+.I cs
+(see
+.IR ndb (8))
+in tuples for hosts that supported the IL protocol
 .PD
 .PP
 .I Cs
@@ -327,8 +323,8 @@
 .LP
 .EX
 ipnet=mh-astro-net ip=135.104.0.0 ipmask=255.255.255.0
-	fs=bootes.research.bell-labs.com
 	ipgw=r70.research.bell-labs.com
+	fs=bootes.research.bell-labs.com
 	auth=p9auth.research.bell-labs.com
 ipnet=unix-room ip=135.104.117.0
 	ipgw=135.104.117.1
--- a/sys/man/8/dhcpd
+++ b/sys/man/8/dhcpd
@@ -112,7 +112,7 @@
 subnet, or the entry for its network.  The system entry has precedence,
 then the subnet, then the network.
 The NDB attributes used are:
-.TF ipmask
+.TF rootserver
 .TP
 .B ip
 the IP address
@@ -160,8 +160,17 @@
 see
 .IR ndb (6)
 .TP
+.B tftp
+the TFTP server to fetch
+.I bootf
+from
+.TP
+.B rootpath
+the NFS root for unix machines
+.TP
 .B rootserver
-used by Unix machines for boot NFS server
+the NFS server used with
+.I rootpath
 .TP
 .B vendor
 Specific vendor attribute for dhcp and bootp