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

2005-05-15 Dan Williams <dcbw@redhat.com>

Browse Source 
* configure.in
		- Check for dhcdbd and error if its not found

	* src/dhcp-manager/Makefile.am
	  src/dhcp-manager/nm-dhcp-manager.c
		- Use path to dhcdbd that configure found


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@630 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-05-15 13:34:41 +00:00
parent 16ef58096b
commit de2e0e55ad
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dhcp-manager/Makefile.am
View File

@@ -8,6 +8,7 @@ libdhcp_manager_la_SOURCES = nm-dhcp-manager.c \
libdhcp_manager_la_CPPFLAGS = $(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(HAL_CFLAGS) \
-DDHCDBD_BINARY_PATH=\"$(DHCDBD_BINARY_PATH)\" \
-g \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \

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

@@ -31,8 +31,6 @@
#include <arpa/inet.h>
#define DHCP_DAEMON_PROGRAM "/sbin/dhcdbd"
struct NMDHCPManager
{
NMData * data;
@@ -87,19 +85,19 @@ static gboolean nm_dhcp_manager_exec_daemon (NMDHCPManager *manager)
g_return_val_if_fail (manager != NULL, FALSE);
dhcp_argv = g_ptr_array_new ();
g_ptr_array_add (dhcp_argv, DHCP_DAEMON_PROGRAM);
g_ptr_array_add (dhcp_argv, DHCDBD_BINARY_PATH);
g_ptr_array_add (dhcp_argv, "--system");
g_ptr_array_add (dhcp_argv, NULL);
if (!g_spawn_async ("/", (char **) dhcp_argv->pdata, NULL, 0, NULL, NULL, &pid, &error))
{
g_ptr_array_free (dhcp_argv, TRUE);
nm_warning ("Could not activate the DHCP daemon " DHCP_DAEMON_PROGRAM ". error: '%s'.", error->message);
nm_warning ("Could not activate the DHCP daemon " DHCDBD_BINARY_PATH ". error: '%s'.", error->message);
g_error_free (error);
return FALSE;
}
g_ptr_array_free (dhcp_argv, TRUE);
nm_info ("Activated the DHCP daemon " DHCP_DAEMON_PROGRAM " with PID %d.", pid);
nm_info ("Activated the DHCP daemon " DHCDBD_BINARY_PATH " with PID %d.", pid);
return TRUE;
}