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

2007-08-14 Dan Williams <dcbw@redhat.com>

Browse Source 
* callouts/Makefile.am
	  src/dhcp-manager/nm-dhcp-manager.c
	  src/dhcp-manager/nm-dhcp-manager.h
	  src/dhcp-manager/Makefile.am
		- Change install location of nm-dhcp-client.action to ${prefix}/libexec



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2682 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-14 18:35:38 +00:00
parent 9bcbbb1cca
commit 93f08e2f11
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2007-08-14 Dan Williams <dcbw@redhat.com>
* callouts/Makefile.am
src/dhcp-manager/nm-dhcp-manager.c
src/dhcp-manager/nm-dhcp-manager.h
src/dhcp-manager/Makefile.am
- Change install location of nm-dhcp-client.action to ${prefix}/libexec
2007-08-14 Dan Williams <dcbw@redhat.com> 2007-08-14 Dan Williams <dcbw@redhat.com>
* src/dhcp-manager/nm-dhcp-manager.c * src/dhcp-manager/nm-dhcp-manager.c

7
callouts/Makefile.am
View File

@@ -1,9 +1,7 @@
dbusservicedir = $(DBUS_SYS_DIR) dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = nm-dhcp-client.conf dbusservice_DATA = nm-dhcp-client.conf
calloutdir = $(sysconfdir)/NetworkManager/callouts libexec_PROGRAMS = nm-dhcp-client.action
callout_PROGRAMS = nm-dhcp-client.action
nm_dhcp_client_action_SOURCES = \ nm_dhcp_client_action_SOURCES = \
nm-dhcp-client-action.c nm-dhcp-client-action.c
@@ -13,7 +11,8 @@ nm_dhcp_client_action_CPPFLAGS = \
$(GTHREAD_CFLAGS) \ $(GTHREAD_CFLAGS) \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
nm_dhcp_client_action_LDADD = \ nm_dhcp_client_action_LDADD = \
$(DBUS_LIBS) \ $(DBUS_LIBS) \

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

@@ -25,7 +25,9 @@ libdhcp_manager_la_CPPFLAGS = $(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \ -DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\"
libdhcp_manager_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS) libdhcp_manager_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS)

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

@@ -37,6 +37,16 @@
#define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client" #define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client"
#define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client"
#define NM_DHCP_MANAGER_RUN_DIR LOCALSTATEDIR "/run"
#define NM_DHCP_MANAGER_PID_FILENAME "dhclient"
#define NM_DHCP_MANAGER_PID_FILE_EXT "pid"
#define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient"
#define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease"
#define ACTION_SCRIPT_PATH LIBEXECDIR "/nm-dhcp-client.action"
#define NM_DHCP_TIMEOUT 45 /* DHCP timeout, in seconds */ #define NM_DHCP_TIMEOUT 45 /* DHCP timeout, in seconds */
static const char *dhclient_binary_paths[] = static const char *dhclient_binary_paths[] =
@@ -662,7 +672,7 @@ dhclient_run (NMDHCPDevice *device)
#endif #endif
g_ptr_array_add (dhclient_argv, (gpointer) "-sf"); /* Set script file */ g_ptr_array_add (dhclient_argv, (gpointer) "-sf"); /* Set script file */
g_ptr_array_add (dhclient_argv, (gpointer) SYSCONFDIR "/NetworkManager/callouts/nm-dhcp-client.action" ); g_ptr_array_add (dhclient_argv, (gpointer) ACTION_SCRIPT_PATH );
g_ptr_array_add (dhclient_argv, (gpointer) "-pf"); /* Set pid file */ g_ptr_array_add (dhclient_argv, (gpointer) "-pf"); /* Set pid file */
g_ptr_array_add (dhclient_argv, (gpointer) pidfile); g_ptr_array_add (dhclient_argv, (gpointer) pidfile);

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

@@ -32,14 +32,6 @@
#define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_MANAGER)) #define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_MANAGER))
#define NM_DHCP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass)) #define NM_DHCP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass))
#define NM_DHCP_MANAGER_RUN_DIR "/var/run"
#define NM_DHCP_MANAGER_PID_FILENAME "dhclient"
#define NM_DHCP_MANAGER_PID_FILE_EXT "pid"
#define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient"
#define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease"
typedef enum { typedef enum {
DHC_NBI=0, /* no broadcast interfaces found */ DHC_NBI=0, /* no broadcast interfaces found */
DHC_PREINIT, /* configuration started */ DHC_PREINIT, /* configuration started */