tags 587473 + patch thanks On 0, Michael Biebl <bi...@debian.org> wrote: > Package: network-manager > Version: 0.8-1 > Severity: normal > > network-manager currently hard codes the location of the lease directory > (/var/lib/dhcp3/) and the dhclient.conf file (/etc/dhcp3/dhclient.conf). > > When switching to isc-dhcp-client, we need to change those paths in > src/dhcp-manager/nm-dhcp-dhclient.c >
Here is a tentative patch which is enough to address main problems raised by the transition. Do you intend to fix this bug soon? Regards, -- Mehdi Dogguy
Index: debian/control =================================================================== --- debian/control (revision 3608) +++ debian/control (working copy) @@ -37,7 +37,7 @@ udev, ifupdown, adduser, - dhcp3-client + dhcp3-client (>= 4.1.0-1), Recommends: network-manager-gnome | network-manager-kde, policykit-1, Index: debian/patches/30-fix_paths_for_dhcp_files.patch =================================================================== --- debian/patches/30-fix_paths_for_dhcp_files.patch (revision 0) +++ debian/patches/30-fix_paths_for_dhcp_files.patch (revision 0) @@ -0,0 +1,22 @@ +--- a/NetworkManager-0.8.orig/src/dhcp-manager/nm-dhcp-dhclient.c ++++ b/NetworkManager-0.8.orig/src/dhcp-manager/nm-dhcp-dhclient.c +@@ -43,9 +43,7 @@ + #define NM_DHCP_MANAGER_PID_FILENAME "dhclient" + #define NM_DHCP_MANAGER_PID_FILE_EXT "pid" + +-#if defined(TARGET_DEBIAN) +-#define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" +-#elif defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) ++#if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) + #define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhcp" + #else + #define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" +@@ -408,7 +406,7 @@ + #if defined(TARGET_SUSE) + orig = g_strdup (SYSCONFDIR "/dhclient.conf"); + #elif defined(TARGET_DEBIAN) +- orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); ++ orig = g_strdup (SYSCONFDIR "/isc-dhcp/dhclient.conf"); + #elif defined(TARGET_GENTOO) + orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); + #else Index: debian/patches/series =================================================================== --- debian/patches/series (revision 3608) +++ debian/patches/series (working copy) @@ -1 +1,2 @@ 02-dbus_access_network_manager.patch +30-fix_paths_for_dhcp_files Index: debian/changelog =================================================================== --- debian/changelog (revision 3608) +++ debian/changelog (working copy) @@ -1,3 +1,12 @@ +network-manager (0.8-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Changes needed to use DHCP v4 (Closes: #587473): + - Fix paths related to DHCP. + - Depend on dhcp3-client (>= 4.1.0-1). + + -- Mehdi Dogguy <me...@debian.org> Thu, 08 Jul 2010 00:05:18 +0200 + network-manager (0.8-1) unstable; urgency=low * New upstream release. @@ -984,4 +993,3 @@ * Initial Release. -- Thom May <t...@debian.org> Sun, 3 Oct 2004 11:54:56 +0100 -
