diff --git a/ChangeLog b/ChangeLog index 3e0d802cd..c5d1030d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-11-12 Colin Walters + + Patches from j bootlab org + + * src/Makefile.am (EXTRA_NetworkManager_SOURCES): + Add interface_parser.[ch]. + + * src/backends/NetworkManagerDebian.c (nm_system_device_run_dhcp): Invoke + dhclient with "-lf /var/lib/dhcp/dhclient-%s.leases". + 2004-11-12 Colin Walters * info-daemon/NetworkManagerInfoDbus.c (nmi_dbus_service_init): Delete diff --git a/src/Makefile.am b/src/Makefile.am index 66c926868..ebc8fb0f6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,8 +41,9 @@ EXTRA_NetworkManager_SOURCES = \ backends/NetworkManagerRedHat.c \ backends/NetworkManagerSlackware.c \ backends/shvar.c \ - backends/shvar.h - + backends/shvar.h \ + backends/interface_parser.c \ + backends/interface_parser.h NetworkManager_LDADD = $(NM_LIBS) $(IWLIB) backends/$(SYSTEM_BACKEND_FILE) if WITH_GCRYPT diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c index 8d53db8db..82b06525d 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -76,11 +76,9 @@ gboolean nm_system_device_run_dhcp (NMDevice *dev) * (for example, bad WEP key so it can't actually talk to the AP). */ iface = nm_device_get_iface (dev); - buf = g_strdup_printf ("/sbin/dhclient -pf /var/run/dhclient-%s.pid %s\n", - iface, iface); - printf("Running %s",buf); + buf = g_strdup_printf ("/sbin/dhclient -1 -q -lf /var/lib/dhcp/dhclient-%s.leases -pf /var/run/dhclient-%s.pid -cf /etc/dhclient-%s.conf %s\n", iface, iface, iface, iface); err = nm_spawn_process (buf); - g_free (buf); + g_free (buf); return (err == 0); }