]>
Commit | Line | Data |
---|---|---|
177b938a MT |
1 | diff -up dhcp-4.2.5b1/client/dhclient.conf.5.man dhcp-4.2.5b1/client/dhclient.conf.5 |
2 | --- dhcp-4.2.5b1/client/dhclient.conf.5.man 2012-12-05 02:17:38.000000000 +0100 | |
3 | +++ dhcp-4.2.5b1/client/dhclient.conf.5 2012-12-17 12:49:52.818451301 +0100 | |
4 | @@ -202,7 +202,8 @@ responding to the client send the client | |
5 | options. Only the option names should be specified in the request | |
6 | statement - not option parameters. By default, the DHCPv4 client | |
6df985df SS |
7 | requests the subnet-mask, broadcast-address, time-offset, routers, |
8 | -domain-name, domain-name-servers and host-name options while the DHCPv6 | |
9 | +domain-search, domain-name, domain-name-servers, host-name, nis-domain, | |
10 | +nis-servers, ntp-servers and interface-mtu options while the DHCPv6 | |
11 | client requests the dhcp6 name-servers and domain-search options. Note | |
12 | that if you enter a \'request\' statement, you over-ride these defaults | |
13 | and these options will not be requested. | |
177b938a | 14 | @@ -688,6 +689,17 @@ know the DHCP service(s) anycast MAC add |
6df985df SS |
15 | client. The \fIlink-type\fR and \fImac-address\fR parameters are configured |
16 | in a similar manner to the \fBhardware\fR statement. | |
17 | .PP | |
18 | + \fBbootp-broadcast-always;\fR | |
19 | +.PP | |
20 | +The | |
21 | +.B bootp-broadcast-always | |
22 | +statement instructs dhclient to always set the bootp broadcast flag in | |
23 | +request packets, so that servers will always broadcast replies. | |
24 | +This is equivalent to supplying the dhclient -B argument, and has | |
25 | +the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. | |
26 | +This option is provided as an extension to enable dhclient to work | |
27 | +on IBM s390 Linux guests. | |
28 | +.PP | |
29 | .SH SAMPLE | |
30 | The following configuration file is used on a laptop running NetBSD | |
177b938a MT |
31 | 1.3. The laptop has an IP alias of 192.5.5.213, and has one |
32 | @@ -713,7 +725,7 @@ interface "ep0" { | |
6df985df SS |
33 | supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com"; |
34 | prepend domain-name-servers 127.0.0.1; | |
35 | request subnet-mask, broadcast-address, time-offset, routers, | |
36 | - domain-name, domain-name-servers, host-name; | |
37 | + domain-search, domain-name, domain-name-servers, host-name; | |
38 | require subnet-mask, domain-name-servers; | |
39 | script "CLIENTBINDIR/dhclient-script"; | |
40 | media "media 10baseT/UTP", "media 10base2/BNC"; | |
177b938a MT |
41 | diff -up dhcp-4.2.5b1/client/dhclient-script.8.man dhcp-4.2.5b1/client/dhclient-script.8 |
42 | --- dhcp-4.2.5b1/client/dhclient-script.8.man 2012-12-05 02:17:38.000000000 +0100 | |
43 | +++ dhcp-4.2.5b1/client/dhclient-script.8 2012-12-17 12:47:48.410130998 +0100 | |
44 | @@ -48,7 +48,7 @@ customizations are needed, they should b | |
6df985df SS |
45 | exit hooks provided (see HOOKS for details). These hooks will allow the |
46 | user to override the default behaviour of the client in creating a | |
47 | .B /etc/resolv.conf | |
48 | -file. | |
49 | +file, and to handle DHCP options not handled by default. | |
50 | .PP | |
51 | No standard client script exists for some operating systems, even though | |
52 | the actual client may work, so a pioneering user may well need to create | |
177b938a | 53 | @@ -92,6 +92,26 @@ present. The |
6df985df SS |
54 | .B ETCDIR/dhclient-exit-hooks |
55 | script can modify the valid of exit_status to change the exit status | |
56 | of dhclient-script. | |
57 | +.PP | |
58 | +Immediately after dhclient brings an interface UP with a new IP address, | |
59 | +subnet mask, and routes, in the REBOOT/BOUND states, it will check for the | |
60 | +existence of an executable | |
61 | +.B ETCDIR/dhclient-up-hooks | |
62 | +script, and source it if found. This script can handle DHCP options in | |
63 | +the environment that are not handled by default. A per-interface. | |
64 | +.B ETCDIR/dhclient-${IF}-up-hooks | |
65 | +script will override the generic script and be sourced when interface | |
66 | +$IF has been brought up. | |
67 | +.PP | |
68 | +Immediately before dhclient brings an interface DOWN, removing its IP | |
69 | +address, subnet mask, and routes, in the STOP/RELEASE states, it will | |
70 | +check for the existence of an executable | |
71 | +.B ETCDIR/dhclient-down-hooks | |
72 | +script, and source it if found. This script can handle DHCP options in | |
73 | +the environment that are not handled by default. A per-interface | |
74 | +.B ETCDIR/dhclient-${IF}-down-hooks | |
75 | +script will override the generic script and be sourced when interface | |
76 | +$IF is about to be brought down. | |
77 | .SH OPERATION | |
78 | When dhclient needs to invoke the client configuration script, it | |
79 | defines a set of variables in the environment, and then invokes | |
177b938a MT |
80 | diff -up dhcp-4.2.5b1/common/dhcp-options.5.man dhcp-4.2.5b1/common/dhcp-options.5 |
81 | --- dhcp-4.2.5b1/common/dhcp-options.5.man 2012-12-05 02:17:38.000000000 +0100 | |
82 | +++ dhcp-4.2.5b1/common/dhcp-options.5 2012-12-17 12:47:48.411130985 +0100 | |
83 | @@ -914,6 +914,21 @@ classless IP routing - it does not inclu | |
6df985df SS |
84 | classless IP routing is now the most widely deployed routing standard, |
85 | this option is virtually useless, and is not implemented by any of the | |
86 | popular DHCP clients, for example the Microsoft DHCP client. | |
87 | +.PP | |
88 | +NOTE to Fedora dhclient users: | |
89 | +.br | |
90 | +dhclient-script interprets trailing 0 octets of the target as indicating | |
91 | +the subnet class of the route, so for the following static-routes value: | |
92 | +.br | |
93 | + option static-routes 172.0.0.0 172.16.2.254, | |
94 | +.br | |
95 | + 192.168.0.0 192.168.2.254; | |
96 | +.br | |
97 | +dhclient-script will create routes: | |
98 | +.br | |
99 | + 172/8 via 172.16.2.254 dev $interface | |
100 | +.br | |
101 | + 192.168/16 via 192.168.2.254 dev $interface | |
102 | .RE | |
103 | .PP | |
104 | .nf | |
177b938a MT |
105 | diff -up dhcp-4.2.5b1/server/dhcpd.conf.5.man dhcp-4.2.5b1/server/dhcpd.conf.5 |
106 | --- dhcp-4.2.5b1/server/dhcpd.conf.5.man 2012-12-05 02:17:39.000000000 +0100 | |
107 | +++ dhcp-4.2.5b1/server/dhcpd.conf.5 2012-12-17 12:50:52.117650542 +0100 | |
6df985df SS |
108 | @@ -519,6 +519,9 @@ pool { |
109 | }; | |
110 | .fi | |
111 | .PP | |
112 | +Dynamic BOOTP leases are not compatible with failover, and, as such, | |
113 | +you need to disallow BOOTP in pools that you are using failover for. | |
114 | +.PP | |
115 | The server currently does very little sanity checking, so if you | |
116 | configure it wrong, it will just fail in odd ways. I would recommend | |
117 | therefore that you either do failover or don't do failover, but don't | |
118 | @@ -533,9 +536,9 @@ primary server might look like this: | |
119 | failover peer "foo" { | |
120 | primary; | |
121 | address anthrax.rc.vix.com; | |
122 | - port 519; | |
123 | + port 647; | |
124 | peer address trantor.rc.vix.com; | |
125 | - peer port 520; | |
126 | + peer port 847; | |
127 | max-response-delay 60; | |
128 | max-unacked-updates 10; | |
129 | mclt 3600; | |
177b938a | 130 | @@ -1318,7 +1321,7 @@ the zone containing PTR records - for IS |
6df985df SS |
131 | .PP |
132 | .nf | |
133 | key DHCP_UPDATER { | |
134 | - algorithm HMAC-MD5.SIG-ALG.REG.INT; | |
135 | + algorithm hmac-md5; | |
136 | secret pRP5FapFoJ95JEL06sv4PQ==; | |
137 | }; | |
138 | ||
177b938a | 139 | @@ -1341,7 +1344,7 @@ dhcpd.conf file: |
6df985df SS |
140 | .PP |
141 | .nf | |
142 | key DHCP_UPDATER { | |
143 | - algorithm HMAC-MD5.SIG-ALG.REG.INT; | |
144 | + algorithm hmac-md5; | |
145 | secret pRP5FapFoJ95JEL06sv4PQ==; | |
146 | }; | |
147 | ||
177b938a | 148 | @@ -2555,7 +2558,8 @@ statement |
6df985df SS |
149 | The \fInext-server\fR statement is used to specify the host address of |
150 | the server from which the initial boot file (specified in the | |
177b938a | 151 | \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should |
6df985df SS |
152 | -be a numeric IP address or a domain name. |
153 | +be a numeric IP address or a domain name. If no \fInext-server\fR statement | |
154 | +applies to a given client, the address 0.0.0.0 is used. | |
155 | .RE | |
156 | .PP | |
157 | The |