]>
Commit | Line | Data |
---|---|---|
15c1a831 MK |
1 | From d359a7dc30e0423f9b90129291538cad1ee6a6d9 Mon Sep 17 00:00:00 2001 |
2 | From: Pavel Zhukov <pzhukov@redhat.com> | |
3 | Date: Thu, 21 Feb 2019 10:25:53 +0100 | |
4 | Subject: [PATCH 06/28] Various man-page-only fixes | |
5 | ||
6 | --- | |
7 | client/dhclient-script.8 | 22 +++++++++++++++++++++- | |
8 | client/dhclient.conf.5 | 14 +++++++++++++- | |
9 | common/dhcp-options.5 | 15 +++++++++++++++ | |
10 | server/dhcpd.conf.5 | 14 +++++++++----- | |
11 | 4 files changed, 58 insertions(+), 7 deletions(-) | |
12 | ||
13 | diff --git a/client/dhclient-script.8 b/client/dhclient-script.8 | |
14 | index 5e5bd3d..37ecdc5 100644 | |
15 | --- a/client/dhclient-script.8 | |
16 | +++ b/client/dhclient-script.8 | |
17 | @@ -43,7 +43,7 @@ customizations are needed, they should be possible using the enter and | |
96d6b603 JR |
18 | exit hooks provided (see HOOKS for details). These hooks will allow the |
19 | user to override the default behaviour of the client in creating a | |
20 | .B /etc/resolv.conf | |
21 | -file. | |
22 | +file, and to handle DHCP options not handled by default. | |
23 | .PP | |
24 | No standard client script exists for some operating systems, even though | |
25 | the actual client may work, so a pioneering user may well need to create | |
15c1a831 | 26 | @@ -87,6 +87,26 @@ present. The |
96d6b603 JR |
27 | .B ETCDIR/dhclient-exit-hooks |
28 | script can modify the valid of exit_status to change the exit status | |
29 | of dhclient-script. | |
30 | +.PP | |
31 | +Immediately after dhclient brings an interface UP with a new IP address, | |
32 | +subnet mask, and routes, in the REBOOT/BOUND states, it will check for the | |
33 | +existence of an executable | |
34 | +.B ETCDIR/dhclient-up-hooks | |
35 | +script, and source it if found. This script can handle DHCP options in | |
36 | +the environment that are not handled by default. A per-interface. | |
37 | +.B ETCDIR/dhclient-${IF}-up-hooks | |
38 | +script will override the generic script and be sourced when interface | |
39 | +$IF has been brought up. | |
40 | +.PP | |
41 | +Immediately before dhclient brings an interface DOWN, removing its IP | |
42 | +address, subnet mask, and routes, in the STOP/RELEASE states, it will | |
43 | +check for the existence of an executable | |
44 | +.B ETCDIR/dhclient-down-hooks | |
45 | +script, and source it if found. This script can handle DHCP options in | |
46 | +the environment that are not handled by default. A per-interface | |
47 | +.B ETCDIR/dhclient-${IF}-down-hooks | |
48 | +script will override the generic script and be sourced when interface | |
49 | +$IF is about to be brought down. | |
50 | .SH OPERATION | |
51 | When dhclient needs to invoke the client configuration script, it | |
52 | defines a set of variables in the environment, and then invokes | |
15c1a831 MK |
53 | diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5 |
54 | index dbe6f7e..8bac980 100644 | |
55 | --- a/client/dhclient.conf.5 | |
56 | +++ b/client/dhclient.conf.5 | |
57 | @@ -228,7 +228,8 @@ responding to the client send the client its values for the specified | |
58 | options. Only the option names should be specified in the request | |
59 | statement - not option parameters. By default, the DHCPv4 client | |
60 | requests the subnet-mask, broadcast-address, time-offset, routers, | |
61 | -domain-name, domain-name-servers and host-name options while the DHCPv6 | |
62 | +domain-search, domain-name, domain-name-servers, host-name, nis-domain, | |
63 | +nis-servers, ntp-servers and interface-mtu options while the DHCPv6 | |
64 | client requests the dhcp6 name-servers and domain-search options. Note | |
65 | that if you enter a \'request\' statement, you over-ride these defaults | |
66 | and these options will not be requested. | |
67 | @@ -735,6 +736,17 @@ broadcast packets transmitted by DHCP clients, but is only useful if you | |
68 | know the DHCP service(s) anycast MAC address prior to configuring your | |
69 | client. The \fIlink-type\fR and \fImac-address\fR parameters are configured | |
70 | in a similar manner to the \fBhardware\fR statement. | |
71 | +.PP | |
72 | + \fBbootp-broadcast-always;\fR | |
73 | +.PP | |
74 | +The | |
75 | +.B bootp-broadcast-always | |
76 | +statement instructs dhclient to always set the bootp broadcast flag in | |
77 | +request packets, so that servers will always broadcast replies. | |
78 | +This is equivalent to supplying the dhclient -B argument, and has | |
79 | +the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. | |
80 | +This option is provided as an extension to enable dhclient to work | |
81 | +on IBM s390 Linux guests. | |
82 | .PP | |
83 | .SH SAMPLE | |
84 | The following configuration file was used on a laptop running NetBSD | |
85 | diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 | |
86 | index 51f80f7..a784b32 100644 | |
87 | --- a/common/dhcp-options.5 | |
88 | +++ b/common/dhcp-options.5 | |
89 | @@ -1075,6 +1075,21 @@ classless IP routing - it does not include a subnet mask. Since | |
96d6b603 JR |
90 | classless IP routing is now the most widely deployed routing standard, |
91 | this option is virtually useless, and is not implemented by any of the | |
92 | popular DHCP clients, for example the Microsoft DHCP client. | |
93 | +.PP | |
19507c9d | 94 | +NOTE to Fedora dhclient users: |
96d6b603 JR |
95 | +.br |
96 | +dhclient-script interprets trailing 0 octets of the target as indicating | |
97 | +the subnet class of the route, so for the following static-routes value: | |
98 | +.br | |
99 | + option static-routes 172.0.0.0 172.16.2.254, | |
100 | +.br | |
101 | + 192.168.0.0 192.168.2.254; | |
102 | +.br | |
103 | +dhclient-script will create routes: | |
104 | +.br | |
105 | + 172/8 via 172.16.2.254 dev $interface | |
106 | +.br | |
107 | + 192.168/16 via 192.168.2.254 dev $interface | |
108 | .RE | |
109 | .PP | |
110 | .nf | |
15c1a831 MK |
111 | diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 |
112 | index 691e5dd..b7e79ea 100644 | |
113 | --- a/server/dhcpd.conf.5 | |
114 | +++ b/server/dhcpd.conf.5 | |
115 | @@ -527,6 +527,9 @@ pool { | |
8c878a4c ER |
116 | }; |
117 | .fi | |
118 | .PP | |
119 | +Dynamic BOOTP leases are not compatible with failover, and, as such, | |
120 | +you need to disallow BOOTP in pools that you are using failover for. | |
121 | +.PP | |
122 | The server currently does very little sanity checking, so if you | |
123 | configure it wrong, it will just fail in odd ways. I would recommend | |
124 | therefore that you either do failover or don't do failover, but don't | |
15c1a831 | 125 | @@ -541,9 +544,9 @@ primary server might look like this: |
8c878a4c ER |
126 | failover peer "foo" { |
127 | primary; | |
19507c9d | 128 | address anthrax.rc.example.com; |
8c878a4c ER |
129 | - port 519; |
130 | + port 647; | |
19507c9d | 131 | peer address trantor.rc.example.com; |
8c878a4c ER |
132 | - peer port 520; |
133 | + peer port 847; | |
134 | max-response-delay 60; | |
135 | max-unacked-updates 10; | |
136 | mclt 3600; | |
15c1a831 | 137 | @@ -1323,7 +1326,7 @@ the zone containing PTR records - for ISC BIND, something like this: |
8c878a4c ER |
138 | .PP |
139 | .nf | |
140 | key DHCP_UPDATER { | |
141 | - algorithm HMAC-MD5.SIG-ALG.REG.INT; | |
142 | + algorithm hmac-md5; | |
143 | secret pRP5FapFoJ95JEL06sv4PQ==; | |
144 | }; | |
145 | ||
15c1a831 | 146 | @@ -1346,7 +1349,7 @@ dhcpd.conf file: |
8c878a4c ER |
147 | .PP |
148 | .nf | |
149 | key DHCP_UPDATER { | |
150 | - algorithm HMAC-MD5.SIG-ALG.REG.INT; | |
151 | + algorithm hmac-md5; | |
152 | secret pRP5FapFoJ95JEL06sv4PQ==; | |
153 | }; | |
154 | ||
15c1a831 | 155 | @@ -2918,7 +2921,8 @@ statement |
8c878a4c ER |
156 | The \fInext-server\fR statement is used to specify the host address of |
157 | the server from which the initial boot file (specified in the | |
96d6b603 | 158 | \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should |
8c878a4c ER |
159 | -be a numeric IP address or a domain name. |
160 | +be a numeric IP address or a domain name. If no \fInext-server\fR statement | |
161 | +applies to a given client, the address 0.0.0.0 is used. | |
162 | .RE | |
163 | .PP | |
164 | The | |
15c1a831 MK |
165 | -- |
166 | 2.35.1 | |
167 | ||
168 | From aa328eef58ff93110f2a52cb3a80002ab8cee36e Mon Sep 17 00:00:00 2001 | |
169 | From: Pavel Zhukov <pzhukov@redhat.com> | |
170 | Date: Tue, 22 Oct 2019 16:28:04 +0200 | |
171 | Subject: [PATCH 26/28] Add dhclient(5) -B option description | |
172 | ||
173 | Bug-Url: https://bugzilla.redhat.com/1764088 | |
174 | --- | |
175 | client/dhclient.8 | 5 +++++ | |
176 | 1 file changed, 5 insertions(+) | |
177 | ||
178 | diff --git a/client/dhclient.8 b/client/dhclient.8 | |
179 | index bacf3bc..76f0cc0 100644 | |
180 | --- a/client/dhclient.8 | |
181 | +++ b/client/dhclient.8 | |
182 | @@ -553,6 +553,11 @@ Path to the network configuration script invoked by | |
183 | when it gets a lease. If unspecified, the default | |
184 | .B CLIENTBINDIR/dhclient-script | |
185 | is used. See \fBdhclient-script(8)\fR for a description of this file. | |
186 | +.TP | |
187 | +.BI \-B | |
188 | +Always set the bootp broadcast flag in request packets, so that | |
189 | +servers will always broadcast replies. This option is provided as | |
190 | +an extension to enable dhclient to work on IBM s390 Linux guests. | |
191 | .PP | |
192 | .SH PORTS | |
193 | During operations the client may use multiple UDP ports | |
194 | -- | |
195 | 2.35.1 | |
196 |