|
 |
fa1179c |
From d8da92991d93a3d1c9fc474696aee25b99623c42 Mon Sep 17 00:00:00 2001
|
|
 |
7c09728 |
From: Pavel Zhukov <pzhukov@redhat.com>
|
|
|
7c09728 |
Date: Thu, 21 Feb 2019 10:26:34 +0100
|
|
|
fa1179c |
Subject: [PATCH 07/28] Change paths to conform to our standards
|
|
|
7c09728 |
|
|
|
7c09728 |
---
|
|
|
7c09728 |
doc/examples/dhcpd-dhcpv6.conf | 2 +-
|
|
|
7c09728 |
includes/dhcpd.h | 6 +++---
|
|
|
7c09728 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
7c09728 |
|
|
|
7c09728 |
diff --git a/doc/examples/dhcpd-dhcpv6.conf b/doc/examples/dhcpd-dhcpv6.conf
|
|
|
7c09728 |
index 448a6a6..2357824 100644
|
|
|
7c09728 |
--- a/doc/examples/dhcpd-dhcpv6.conf
|
|
|
7c09728 |
+++ b/doc/examples/dhcpd-dhcpv6.conf
|
|
|
7c09728 |
@@ -43,7 +43,7 @@ option dhcp6.domain-search "test.example.com","example.com";
|
|
 |
00ed774 |
option dhcp6.info-refresh-time 21600;
|
|
|
00ed774 |
|
|
|
00ed774 |
# The path of the lease file
|
|
|
00ed774 |
-dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases";
|
|
|
00ed774 |
+dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases";
|
|
|
00ed774 |
|
|
|
00ed774 |
# Static definition (must be global)
|
|
|
00ed774 |
host myclient {
|
|
|
7c09728 |
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
|
|
|
fa1179c |
index 3b2e2ca..4a57002 100644
|
|
|
7c09728 |
--- a/includes/dhcpd.h
|
|
|
7c09728 |
+++ b/includes/dhcpd.h
|
|
|
fa1179c |
@@ -1561,7 +1561,7 @@ typedef unsigned char option_mask [16];
|
|
|
b2ce0ea |
#else /* !DEBUG */
|
|
|
b2ce0ea |
|
|
|
b2ce0ea |
#ifndef _PATH_DHCPD_CONF
|
|
|
b2ce0ea |
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
|
|
|
b2ce0ea |
+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
|
|
|
b2ce0ea |
#endif /* DEBUG */
|
|
|
b2ce0ea |
|
|
|
b2ce0ea |
#ifndef _PATH_DHCPD_DB
|
|
|
fa1179c |
@@ -1583,11 +1583,11 @@ typedef unsigned char option_mask [16];
|
|
|
b2ce0ea |
#endif /* DEBUG */
|
|
|
b2ce0ea |
|
|
|
b2ce0ea |
#ifndef _PATH_DHCLIENT_CONF
|
|
|
b2ce0ea |
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
|
|
|
b2ce0ea |
+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
|
|
|
b2ce0ea |
#endif
|
|
|
b2ce0ea |
|
|
|
b2ce0ea |
#ifndef _PATH_DHCLIENT_SCRIPT
|
|
|
b2ce0ea |
-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script"
|
|
|
b2ce0ea |
+#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script"
|
|
|
b2ce0ea |
#endif
|
|
|
b2ce0ea |
|
|
|
b2ce0ea |
#ifndef _PATH_DHCLIENT_PID
|
|
|
7c09728 |
--
|
|
|
fa1179c |
2.35.1
|
|
|
7c09728 |
|