]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/dhcp/dhcp-paths.patch
Merge remote-tracking branch 'earl/tor' into next
[ipfire-2.x.git] / src / patches / dhcp / dhcp-paths.patch
1 --- expanded_org/includes/dhcpd.h Wed Aug 06 23:35:02 2014
2 +++ expanded_patched_51_4_2_0_paths_patch/includes/dhcpd.h Mon Feb 16 13:22:11 2015
3 @@ -1424,15 +1424,15 @@
4 #else /* !DEBUG */
5
6 #ifndef _PATH_DHCPD_CONF
7 -#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
8 +#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
9 #endif /* DEBUG */
10
11 #ifndef _PATH_DHCPD_DB
12 -#define _PATH_DHCPD_DB LOCALSTATEDIR"/db/dhcpd.leases"
13 +#define _PATH_DHCPD_DB LOCALSTATEDIR"/dhcpd/dhcpd.leases"
14 #endif
15
16 #ifndef _PATH_DHCPD6_DB
17 -#define _PATH_DHCPD6_DB LOCALSTATEDIR"/db/dhcpd6.leases"
18 +#define _PATH_DHCPD6_DB LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
19 #endif
20
21 #ifndef _PATH_DHCPD_PID
22 @@ -1446,7 +1446,7 @@
23 #endif /* DEBUG */
24
25 #ifndef _PATH_DHCLIENT_CONF
26 -#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
27 +#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
28 #endif
29
30 #ifndef _PATH_DHCLIENT_SCRIPT
31 @@ -1462,11 +1462,11 @@
32 #endif
33
34 #ifndef _PATH_DHCLIENT_DB
35 -#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/db/dhclient.leases"
36 +#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/dhclient/dhclient.leases"
37 #endif
38
39 #ifndef _PATH_DHCLIENT6_DB
40 -#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/db/dhclient6.leases"
41 +#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/dhclient/dhclient6.leases"
42 #endif
43
44 #ifndef _PATH_RESOLV_CONF