colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp: use ISC DHCPv4 paths now that v4 is nominally required

Browse Source
This commit is contained in:
Michael Biebl
2010-07-09 11:33:27 -07:00
committed by Dan Williams
parent 8a1fe31b31
commit c8c161780a
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dhcp-manager/nm-dhcp-dhclient.c
View File

@@ -44,9 +44,7 @@ G_DEFINE_TYPE (NMDHCPDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
#define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate)) #define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate))
#if defined(TARGET_DEBIAN) #if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA)
#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3"
#elif defined(TARGET_SUSE) || defined(TARGET_MANDRIVA)
#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp" #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp"
#else #else
#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhclient"
@@ -438,9 +436,7 @@ create_dhclient_config (const char *iface,
#if defined(TARGET_SUSE) #if defined(TARGET_SUSE)
orig = g_strdup (SYSCONFDIR "/dhclient.conf"); orig = g_strdup (SYSCONFDIR "/dhclient.conf");
#elif defined(TARGET_DEBIAN) #elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO)
orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf");
#elif defined(TARGET_GENTOO)
orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf");
#else #else
orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface); orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface);