2004-11-12 Colin Walters <walters@redhat.com>
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". git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@307 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:

committed by
Colin Walters

parent
8e82891602
commit
f3f21c487e
10
ChangeLog
10
ChangeLog
@@ -1,3 +1,13 @@
|
||||
2004-11-12 Colin Walters <walters@redhat.com>
|
||||
|
||||
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 <walters@redhat.com>
|
||||
|
||||
* info-daemon/NetworkManagerInfoDbus.c (nmi_dbus_service_init): Delete
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user