]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/dhcp-4.2.1-manpages.patch
Update translations
[people/pmueller/ipfire-2.x.git] / src / patches / dhcp-4.2.1-manpages.patch
1 diff -up dhcp-4.2.1b1/client/dhclient.8.man dhcp-4.2.1b1/client/dhclient.8
2 --- dhcp-4.2.1b1/client/dhclient.8.man 2010-07-14 22:09:34.000000000 +0200
3 +++ dhcp-4.2.1b1/client/dhclient.8 2011-01-27 18:19:07.000000000 +0100
4 @@ -115,6 +115,33 @@ dhclient - Dynamic Host Configuration Pr
5 .B -w
6 ]
7 [
8 +.B -B
9 +]
10 +[
11 +.B -I
12 +.I dhcp-client-identifier
13 +]
14 +[
15 +.B -H
16 +.I host-name
17 +]
18 +[
19 +.B -F
20 +.I fqdn.fqdn
21 +]
22 +[
23 +.B -V
24 +.I vendor-class-identifier
25 +]
26 +[
27 +.B -R
28 +.I request-option-list
29 +]
30 +[
31 +.B -timeout
32 +.I timeout
33 +]
34 +[
35 .B -v
36 ]
37 [
38 @@ -264,6 +291,69 @@ not to exit when it doesn't find any suc
39 program can then be used to notify the client when a network interface
40 has been added or removed, so that the client can attempt to configure an IP
41 address on that interface.
42 +
43 +.TP
44 +.BI \-B
45 +Set the BOOTP broadcast flag in request packets so servers will always
46 +broadcast replies.
47 +
48 +.TP
49 +.BI \-I\ <dhcp-client-identifier>
50 +Specify the dhcp-client-identifier option to send to the DHCP server.
51 +
52 +.TP
53 +.BI \-H\ <host-name>
54 +Specify the host-name option to send to the DHCP server. The host-name
55 +string only contains the client's hostname prefix, to which the server will
56 +append the ddns-domainname or domain-name options, if any, to derive the
57 +fully qualified domain name of the client. The
58 +.B -H
59 +option cannot be used with the
60 +.B -F
61 +option.
62 +
63 +.TP
64 +.BI \-F\ <fqdn.fqdn>
65 +Specify the fqdn.fqdn option to send to the DHCP server. This option cannot
66 +be used with the
67 +.B -H
68 +option. The fqdn.fqdn option must specify the complete domain name of the
69 +client host, which the server may use for dynamic DNS updates.
70 +
71 +.TP
72 +.BI \-V\ <vendor-class-identifier>
73 +Specify the vendor-class-identifier option to send to the DHCP server.
74 +
75 +.TP
76 +.BI \-R\ <option>[,<option>...]
77 +Specify the list of options the client is to request from the server. The
78 +option list must be a single string consisting of option names separated
79 +by at least one command and optional space characters. The default option
80 +list is:
81 +
82 +.BR
83 + subnet-mask, broadcast-address, time-offset, routers,
84 +.BR
85 + domain-search, domain-name, domain-name-servers, host-name,
86 +.BR
87 + nis-domain, nis-servers, ntp-servers, interface-mtu
88 +
89 +.TP
90 +.B -R
91 +option does not append options to the default request, it overrides the
92 +default request list. Keep this in mind if you want to request an
93 +additional option besides the default request list. You will have to
94 +specify all option names for the
95 +.B -R
96 +parameter.
97 +
98 +.TP
99 +.BI \-timeout\ <timeout>
100 +Specify the time after which
101 +.B dhclient
102 +will decide that no DHCP servers can be contacted when no responses have been
103 +received.
104 +
105 .TP
106 .BI \-n
107 Do not configure any interfaces. This is most likely to be useful in
108 diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.conf.5
109 --- dhcp-4.2.1b1/client/dhclient.conf.5.man 2010-09-15 01:03:56.000000000 +0200
110 +++ dhcp-4.2.1b1/client/dhclient.conf.5 2011-01-27 18:22:56.000000000 +0100
111 @@ -186,7 +186,8 @@ responding to the client send the client
112 options. Only the option names should be specified in the request
113 statement - not option parameters. By default, the DHCPv4 client
114 requests the subnet-mask, broadcast-address, time-offset, routers,
115 -domain-name, domain-name-servers and host-name options while the DHCPv6
116 +domain-search, domain-name, domain-name-servers, host-name, nis-domain,
117 +nis-servers, ntp-servers and interface-mtu options while the DHCPv6
118 client requests the dhcp6 name-servers and domain-search options. Note
119 that if you enter a \'request\' statement, you over-ride these defaults
120 and these options will not be requested.
121 @@ -672,6 +673,17 @@ know the DHCP service(s) anycast MAC add
122 client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
123 in a similar manner to the \fBhardware\fR statement.
124 .PP
125 + \fBbootp-broadcast-always;\fR
126 +.PP
127 +The
128 +.B bootp-broadcast-always
129 +statement instructs dhclient to always set the bootp broadcast flag in
130 +request packets, so that servers will always broadcast replies.
131 +This is equivalent to supplying the dhclient -B argument, and has
132 +the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
133 +This option is provided as an extension to enable dhclient to work
134 +on IBM s390 Linux guests.
135 +.PP
136 .SH SAMPLE
137 The following configuration file is used on a laptop running NetBSD
138 1.3. The laptop has an IP alias of 192.5.5.213, and has one
139 @@ -697,7 +709,7 @@ interface "ep0" {
140 supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
141 prepend domain-name-servers 127.0.0.1;
142 request subnet-mask, broadcast-address, time-offset, routers,
143 - domain-name, domain-name-servers, host-name;
144 + domain-search, domain-name, domain-name-servers, host-name;
145 require subnet-mask, domain-name-servers;
146 script "CLIENTBINDIR/dhclient-script";
147 media "media 10baseT/UTP", "media 10base2/BNC";
148 diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-script.8
149 --- dhcp-4.2.1b1/client/dhclient-script.8.man 2010-07-06 21:03:11.000000000 +0200
150 +++ dhcp-4.2.1b1/client/dhclient-script.8 2011-01-27 18:24:44.000000000 +0100
151 @@ -47,7 +47,7 @@ customizations are needed, they should b
152 exit hooks provided (see HOOKS for details). These hooks will allow the
153 user to override the default behaviour of the client in creating a
154 .B /etc/resolv.conf
155 -file.
156 +file, and to handle DHCP options not handled by default.
157 .PP
158 No standard client script exists for some operating systems, even though
159 the actual client may work, so a pioneering user may well need to create
160 @@ -91,6 +91,26 @@ present. The
161 .B ETCDIR/dhclient-exit-hooks
162 script can modify the valid of exit_status to change the exit status
163 of dhclient-script.
164 +.PP
165 +Immediately after dhclient brings an interface UP with a new IP address,
166 +subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
167 +existence of an executable
168 +.B ETCDIR/dhclient-up-hooks
169 +script, and source it if found. This script can handle DHCP options in
170 +the environment that are not handled by default. A per-interface.
171 +.B ETCDIR/dhclient-${IF}-up-hooks
172 +script will override the generic script and be sourced when interface
173 +$IF has been brought up.
174 +.PP
175 +Immediately before dhclient brings an interface DOWN, removing its IP
176 +address, subnet mask, and routes, in the STOP/RELEASE states, it will
177 +check for the existence of an executable
178 +.B ETCDIR/dhclient-down-hooks
179 +script, and source it if found. This script can handle DHCP options in
180 +the environment that are not handled by default. A per-interface
181 +.B ETCDIR/dhclient-${IF}-down-hooks
182 +script will override the generic script and be sourced when interface
183 +$IF is about to be brought down.
184 .SH OPERATION
185 When dhclient needs to invoke the client configuration script, it
186 defines a set of variables in the environment, and then invokes
187 diff -up dhcp-4.2.1b1/common/dhcp-options.5.man dhcp-4.2.1b1/common/dhcp-options.5
188 --- dhcp-4.2.1b1/common/dhcp-options.5.man 2010-07-13 22:56:56.000000000 +0200
189 +++ dhcp-4.2.1b1/common/dhcp-options.5 2011-01-27 18:25:57.000000000 +0100
190 @@ -913,6 +913,21 @@ classless IP routing - it does not inclu
191 classless IP routing is now the most widely deployed routing standard,
192 this option is virtually useless, and is not implemented by any of the
193 popular DHCP clients, for example the Microsoft DHCP client.
194 +.PP
195 +NOTE to Fedora dhclient users:
196 +.br
197 +dhclient-script interprets trailing 0 octets of the target as indicating
198 +the subnet class of the route, so for the following static-routes value:
199 +.br
200 + option static-routes 172.0.0.0 172.16.2.254,
201 +.br
202 + 192.168.0.0 192.168.2.254;
203 +.br
204 +dhclient-script will create routes:
205 +.br
206 + 172/8 via 172.16.2.254 dev $interface
207 +.br
208 + 192.168/16 via 192.168.2.254 dev $interface
209 .RE
210 .PP
211 .nf
212 diff -up dhcp-4.2.1b1/server/dhcpd.conf.5.man dhcp-4.2.1b1/server/dhcpd.conf.5
213 --- dhcp-4.2.1b1/server/dhcpd.conf.5.man 2010-07-06 21:03:12.000000000 +0200
214 +++ dhcp-4.2.1b1/server/dhcpd.conf.5 2011-01-27 18:29:12.000000000 +0100
215 @@ -519,6 +519,9 @@ pool {
216 };
217 .fi
218 .PP
219 +Dynamic BOOTP leases are not compatible with failover, and, as such,
220 +you need to disallow BOOTP in pools that you are using failover for.
221 +.PP
222 The server currently does very little sanity checking, so if you
223 configure it wrong, it will just fail in odd ways. I would recommend
224 therefore that you either do failover or don't do failover, but don't
225 @@ -533,9 +536,9 @@ primary server might look like this:
226 failover peer "foo" {
227 primary;
228 address anthrax.rc.vix.com;
229 - port 519;
230 + port 647;
231 peer address trantor.rc.vix.com;
232 - peer port 520;
233 + peer port 847;
234 max-response-delay 60;
235 max-unacked-updates 10;
236 mclt 3600;
237 @@ -1305,7 +1308,7 @@ the zone containing PTR records - for IS
238 .PP
239 .nf
240 key DHCP_UPDATER {
241 - algorithm HMAC-MD5.SIG-ALG.REG.INT;
242 + algorithm hmac-md5;
243 secret pRP5FapFoJ95JEL06sv4PQ==;
244 };
245
246 @@ -1328,7 +1331,7 @@ dhcpd.conf file:
247 .PP
248 .nf
249 key DHCP_UPDATER {
250 - algorithm HMAC-MD5.SIG-ALG.REG.INT;
251 + algorithm hmac-md5;
252 secret pRP5FapFoJ95JEL06sv4PQ==;
253 };
254
255 @@ -2540,7 +2543,8 @@ statement
256 The \fInext-server\fR statement is used to specify the host address of
257 the server from which the initial boot file (specified in the
258 \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
259 -be a numeric IP address or a domain name.
260 +be a numeric IP address or a domain name. If no \fInext-server\fR statement
261 +applies to a given client, the address 0.0.0.0 is used.
262 .RE
263 .PP
264 The