|
 |
fad460 |
diff -up dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf
|
|
|
fad460 |
--- dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf.paths 2012-08-24 21:11:21.000000000 +0200
|
|
|
fad460 |
+++ dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf 2012-10-26 18:10:08.716560729 +0200
|
|
|
fad460 |
@@ -42,7 +42,7 @@ option dhcp6.domain-search "test.example
|
|
|
fad460 |
option dhcp6.info-refresh-time 21600;
|
|
|
fad460 |
|
|
|
fad460 |
# The path of the lease file
|
|
|
fad460 |
-dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases";
|
|
|
fad460 |
+dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases";
|
|
|
fad460 |
|
|
|
fad460 |
# Static definition (must be global)
|
|
|
fad460 |
host myclient {
|
|
|
fad460 |
diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
|
|
|
fad460 |
--- dhcp-4.2.4b1/includes/dhcpd.h.paths 2012-04-18 11:12:34.000000000 +0200
|
|
|
fad460 |
+++ dhcp-4.2.4b1/includes/dhcpd.h 2012-04-18 11:14:38.541272405 +0200
|
|
|
fad460 |
@@ -1420,7 +1420,7 @@ typedef unsigned char option_mask [16];
|
|
|
fad460 |
#else /* !DEBUG */
|
|
|
fad460 |
|
|
|
fad460 |
#ifndef _PATH_DHCPD_CONF
|
|
|
fad460 |
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
|
|
|
fad460 |
+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
|
|
|
fad460 |
#endif /* DEBUG */
|
|
|
fad460 |
|
|
|
fad460 |
#ifndef _PATH_DHCPD_DB
|
|
|
fad460 |
@@ -1442,11 +1442,11 @@ typedef unsigned char option_mask [16];
|
|
|
fad460 |
#endif /* DEBUG */
|
|
|
fad460 |
|
|
|
fad460 |
#ifndef _PATH_DHCLIENT_CONF
|
|
|
fad460 |
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
|
|
|
fad460 |
+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
|
|
|
fad460 |
#endif
|
|
|
fad460 |
|
|
|
fad460 |
#ifndef _PATH_DHCLIENT_SCRIPT
|
|
|
fad460 |
-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script"
|
|
|
fad460 |
+#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script"
|
|
|
fad460 |
#endif
|
|
|
fad460 |
|
|
|
fad460 |
#ifndef _PATH_DHCLIENT_PID
|