1 |
diff -Naur -x '*~' dhcp-4.2.4-P2/client/dhclient.conf.5 dhcp-4.2.4-P2-man/client/dhclient.conf.5 |
2 |
--- dhcp-4.2.4-P2/client/dhclient.conf.5 2012-08-28 04:13:03.000000000 +0200 |
3 |
+++ dhcp-4.2.4-P2-man/client/dhclient.conf.5 2012-12-26 14:00:03.058268574 +0100 |
4 |
@@ -202,7 +202,8 @@ |
5 |
options. Only the option names should be specified in the request |
6 |
statement - not option parameters. By default, the DHCPv4 client |
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. |
14 |
@@ -713,7 +714,7 @@ |
15 |
supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com"; |
16 |
prepend domain-name-servers 127.0.0.1; |
17 |
request subnet-mask, broadcast-address, time-offset, routers, |
18 |
- domain-name, domain-name-servers, host-name; |
19 |
+ domain-search, domain-name, domain-name-servers, host-name; |
20 |
require subnet-mask, domain-name-servers; |
21 |
script "CLIENTBINDIR/dhclient-script"; |
22 |
media "media 10baseT/UTP", "media 10base2/BNC"; |