]>
Commit | Line | Data |
---|---|---|
177b938a MT |
1 | diff -up dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf |
2 | --- dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf.paths 2012-08-24 21:11:21.000000000 +0200 | |
3 | +++ dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf 2012-10-26 18:10:08.716560729 +0200 | |
4 | @@ -42,7 +42,7 @@ option dhcp6.domain-search "test.example | |
5 | option dhcp6.info-refresh-time 21600; | |
6 | ||
7 | # The path of the lease file | |
8 | -dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases"; | |
9 | +dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases"; | |
10 | ||
11 | # Static definition (must be global) | |
12 | host myclient { | |
444c1184 MT |
13 | diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h |
14 | --- dhcp-4.2.4b1/includes/dhcpd.h.paths 2012-04-18 11:12:34.000000000 +0200 | |
15 | +++ dhcp-4.2.4b1/includes/dhcpd.h 2012-04-18 11:14:38.541272405 +0200 | |
16 | @@ -1420,7 +1420,7 @@ typedef unsigned char option_mask [16]; | |
17 | #else /* !DEBUG */ | |
18 | ||
19 | #ifndef _PATH_DHCPD_CONF | |
20 | -#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" | |
21 | +#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" | |
22 | #endif /* DEBUG */ | |
23 | ||
24 | #ifndef _PATH_DHCPD_DB | |
25 | @@ -1442,11 +1442,11 @@ typedef unsigned char option_mask [16]; | |
26 | #endif /* DEBUG */ | |
27 | ||
28 | #ifndef _PATH_DHCLIENT_CONF | |
29 | -#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" | |
30 | +#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" | |
31 | #endif | |
32 | ||
33 | #ifndef _PATH_DHCLIENT_SCRIPT | |
34 | -#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" | |
35 | +#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script" | |
36 | #endif | |
37 | ||
38 | #ifndef _PATH_DHCLIENT_PID |