2013-12-20 15:13:52 +00:00
|
|
|
diff -up dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf
|
|
|
|
|
--- dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths 2013-11-07 20:15:08.000000000 +0100
|
|
|
|
|
+++ dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf 2013-12-19 15:34:16.262247711 +0100
|
2012-10-26 16:14:44 +00:00
|
|
|
@@ -42,7 +42,7 @@ option dhcp6.domain-search "test.example
|
|
|
|
|
option dhcp6.info-refresh-time 21600;
|
|
|
|
|
|
|
|
|
|
# The path of the lease file
|
|
|
|
|
-dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases";
|
|
|
|
|
+dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases";
|
|
|
|
|
|
|
|
|
|
# Static definition (must be global)
|
|
|
|
|
host myclient {
|
2013-12-20 15:13:52 +00:00
|
|
|
diff -up dhcp-4.3.0a1/includes/dhcpd.h.paths dhcp-4.3.0a1/includes/dhcpd.h
|
|
|
|
|
--- dhcp-4.3.0a1/includes/dhcpd.h.paths 2013-12-19 15:34:16.253247840 +0100
|
|
|
|
|
+++ dhcp-4.3.0a1/includes/dhcpd.h 2013-12-19 15:34:16.263247697 +0100
|
|
|
|
|
@@ -1429,7 +1429,7 @@ typedef unsigned char option_mask [16];
|
2012-04-18 09:17:13 +00:00
|
|
|
#else /* !DEBUG */
|
|
|
|
|
|
|
|
|
|
#ifndef _PATH_DHCPD_CONF
|
|
|
|
|
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
|
|
|
|
|
+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
|
|
|
|
|
#endif /* DEBUG */
|
|
|
|
|
|
|
|
|
|
#ifndef _PATH_DHCPD_DB
|
2013-12-20 15:13:52 +00:00
|
|
|
@@ -1451,11 +1451,11 @@ typedef unsigned char option_mask [16];
|
2012-04-18 09:17:13 +00:00
|
|
|
#endif /* DEBUG */
|
|
|
|
|
|
|
|
|
|
#ifndef _PATH_DHCLIENT_CONF
|
|
|
|
|
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
|
|
|
|
|
+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef _PATH_DHCLIENT_SCRIPT
|
|
|
|
|
-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script"
|
|
|
|
|
+#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef _PATH_DHCLIENT_PID
|
