]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/dhcp/dhcp-manpages.patch
dde16c73525d16b93eff756c4a38a4fcc5576f9b
[people/pmueller/ipfire-2.x.git] / src / patches / dhcp / dhcp-manpages.patch
1 diff -up dhcp-4.3.0a1/client/dhclient-script.8.man dhcp-4.3.0a1/client/dhclient-script.8
2 --- dhcp-4.3.0a1/client/dhclient-script.8.man 2013-12-11 01:01:02.000000000 +0100
3 +++ dhcp-4.3.0a1/client/dhclient-script.8 2013-12-19 15:27:17.617118805 +0100
4 @@ -48,7 +48,7 @@ customizations are needed, they should b
5 exit hooks provided (see HOOKS for details). These hooks will allow the
6 user to override the default behaviour of the client in creating a
7 .B /etc/resolv.conf
8 -file.
9 +file, and to handle DHCP options not handled by default.
10 .PP
11 No standard client script exists for some operating systems, even though
12 the actual client may work, so a pioneering user may well need to create
13 @@ -92,6 +92,26 @@ present. The
14 .B ETCDIR/dhclient-exit-hooks
15 script can modify the valid of exit_status to change the exit status
16 of dhclient-script.
17 +.PP
18 +Immediately after dhclient brings an interface UP with a new IP address,
19 +subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
20 +existence of an executable
21 +.B ETCDIR/dhclient-up-hooks
22 +script, and source it if found. This script can handle DHCP options in
23 +the environment that are not handled by default. A per-interface.
24 +.B ETCDIR/dhclient-${IF}-up-hooks
25 +script will override the generic script and be sourced when interface
26 +$IF has been brought up.
27 +.PP
28 +Immediately before dhclient brings an interface DOWN, removing its IP
29 +address, subnet mask, and routes, in the STOP/RELEASE states, it will
30 +check for the existence of an executable
31 +.B ETCDIR/dhclient-down-hooks
32 +script, and source it if found. This script can handle DHCP options in
33 +the environment that are not handled by default. A per-interface
34 +.B ETCDIR/dhclient-${IF}-down-hooks
35 +script will override the generic script and be sourced when interface
36 +$IF is about to be brought down.
37 .SH OPERATION
38 When dhclient needs to invoke the client configuration script, it
39 defines a set of variables in the environment, and then invokes
40 diff -up dhcp-4.3.0a1/client/dhclient.conf.5.man dhcp-4.3.0a1/client/dhclient.conf.5
41 --- dhcp-4.3.0a1/client/dhclient.conf.5.man 2013-12-11 01:01:02.000000000 +0100
42 +++ dhcp-4.3.0a1/client/dhclient.conf.5 2013-12-19 15:27:17.617118805 +0100
43 @@ -202,7 +202,8 @@ responding to the client send the client
44 options. Only the option names should be specified in the request
45 statement - not option parameters. By default, the DHCPv4 client
46 requests the subnet-mask, broadcast-address, time-offset, routers,
47 -domain-name, domain-name-servers and host-name options while the DHCPv6
48 +domain-search, domain-name, domain-name-servers, host-name, nis-domain,
49 +nis-servers, ntp-servers and interface-mtu options while the DHCPv6
50 client requests the dhcp6 name-servers and domain-search options. Note
51 that if you enter a \'request\' statement, you over-ride these defaults
52 and these options will not be requested.
53 @@ -688,6 +689,17 @@ know the DHCP service(s) anycast MAC add
54 client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
55 in a similar manner to the \fBhardware\fR statement.
56 .PP
57 + \fBbootp-broadcast-always;\fR
58 +.PP
59 +The
60 +.B bootp-broadcast-always
61 +statement instructs dhclient to always set the bootp broadcast flag in
62 +request packets, so that servers will always broadcast replies.
63 +This is equivalent to supplying the dhclient -B argument, and has
64 +the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
65 +This option is provided as an extension to enable dhclient to work
66 +on IBM s390 Linux guests.
67 +.PP
68 .SH SAMPLE
69 The following configuration file is used on a laptop running NetBSD
70 1.3. The laptop has an IP alias of 192.5.5.213, and has one
71 @@ -713,7 +725,7 @@ interface "ep0" {
72 supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
73 prepend domain-name-servers 127.0.0.1;
74 request subnet-mask, broadcast-address, time-offset, routers,
75 - domain-name, domain-name-servers, host-name;
76 + domain-search, domain-name, domain-name-servers, host-name;
77 require subnet-mask, domain-name-servers;
78 script "CLIENTBINDIR/dhclient-script";
79 media "media 10baseT/UTP", "media 10base2/BNC";
80 diff -up dhcp-4.3.0a1/common/dhcp-options.5.man dhcp-4.3.0a1/common/dhcp-options.5
81 --- dhcp-4.3.0a1/common/dhcp-options.5.man 2013-12-11 01:25:12.000000000 +0100
82 +++ dhcp-4.3.0a1/common/dhcp-options.5 2013-12-19 15:27:17.618118791 +0100
83 @@ -914,6 +914,21 @@ classless IP routing - it does not inclu
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
105 diff -up dhcp-4.3.0a1/server/dhcpd.conf.5.man dhcp-4.3.0a1/server/dhcpd.conf.5
106 --- dhcp-4.3.0a1/server/dhcpd.conf.5.man 2013-12-13 21:49:44.000000000 +0100
107 +++ dhcp-4.3.0a1/server/dhcpd.conf.5 2013-12-19 15:30:14.266670962 +0100
108 @@ -527,6 +527,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 @@ -541,9 +544,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;
130 @@ -1241,7 +1244,7 @@ the zone containing PTR records - for IS
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
139 @@ -1264,7 +1267,7 @@ dhcpd.conf file:
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
148 @@ -2539,7 +2542,8 @@ statement
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
151 \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
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