diff options
| author | Michael Biebl <biebl@debian.org> | 2010-07-08 02:19:21 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-07-08 02:19:21 +0000 |
| commit | 6296b7f6d9a5eba36a5bb6d1509ae86fb5976737 (patch) | |
| tree | d5ba7da3f5329616bcddc8085dd157504f815a26 | |
| parent | 9947efda624e9ab95bb580f76804509e32fa3bf6 (diff) | |
* debian/patches/30-fix_paths_for_isc_dhcp_v4.patch
- Update dhclient.conf and lease directory path for isc-dhcp-client.
(Closes: #587473)
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3625 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/30-fix_paths_for_isc_dhcp_v4.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f8a00703..c2a79403 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low * debian/control - Update Depends on dhcp3-client to isc-dhcp-client (>= 4.1.1-P1-4) to get DHCPv6 support. + * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch + - Update dhclient.conf and lease directory path for isc-dhcp-client. + (Closes: #587473) -- Michael Biebl <biebl@debian.org> Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch b/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch new file mode 100644 index 00000000..5a3e5336 --- /dev/null +++ b/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch @@ -0,0 +1,26 @@ +Index: b/src/dhcp-manager/nm-dhcp-dhclient.c +=================================================================== +--- a/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:18.421304546 +0200 ++++ b/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:31.369301275 +0200 +@@ -44,9 +44,7 @@ + + #define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate)) + +-#if defined(TARGET_DEBIAN) +-#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" +-#elif defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) ++#if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) + #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp" + #else + #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" +@@ -437,9 +435,7 @@ + + #if defined(TARGET_SUSE) + orig = g_strdup (SYSCONFDIR "/dhclient.conf"); +-#elif defined(TARGET_DEBIAN) +- orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); +-#elif defined(TARGET_GENTOO) ++#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) + orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); + #else + orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface); diff --git a/debian/patches/series b/debian/patches/series index 5bb8c3f1..b4d0a45e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +# Debian patches for network-manager 02-dbus_access_network_manager.patch +30-fix_paths_for_isc_dhcp_v4.patch |