diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-05-14 14:51:43 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-06-06 13:43:45 -0500 |
| commit | 4cc13befd3cc242c5065ce6ea91e335b705b2f36 (patch) | |
| tree | 953e7ac6248030fc6e6d5af1c49c938272bff09b /callouts | |
| parent | c93ae45b42dc94fce8088a6291664aa403fc6da6 (diff) | |
dispatcher: rename executable to 'nm-dispatcher'
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/Makefile.am | 10 | ||||
| -rw-r--r-- | callouts/nm-dispatcher-api.h (renamed from callouts/nm-dispatcher-action.h) | 0 | ||||
| -rw-r--r-- | callouts/nm-dispatcher-utils.c | 2 | ||||
| -rw-r--r-- | callouts/nm-dispatcher.c (renamed from callouts/nm-dispatcher-action.c) | 2 | ||||
| -rw-r--r-- | callouts/org.freedesktop.nm_dispatcher.service.in | 2 | ||||
| -rw-r--r-- | callouts/tests/test-dispatcher-envp.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 8b018be703..a7ef429849 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -26,7 +26,7 @@ dbusservice_DATA = \ nm-avahi-autoipd.conf libexec_PROGRAMS = \ - nm-dispatcher.action \ + nm-dispatcher \ nm-avahi-autoipd.action @@ -38,13 +38,13 @@ nm_avahi_autoipd_action_LDADD = \ $(GLIB_LIBS) -nm_dispatcher_action_SOURCES = \ - nm-dispatcher-action.c \ - nm-dispatcher-action.h \ +nm_dispatcher_SOURCES = \ + nm-dispatcher.c \ + nm-dispatcher-api.h \ nm-dispatcher-utils.c \ nm-dispatcher-utils.h -nm_dispatcher_action_LDADD = \ +nm_dispatcher_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) diff --git a/callouts/nm-dispatcher-action.h b/callouts/nm-dispatcher-api.h index 9fea487ada..9fea487ada 100644 --- a/callouts/nm-dispatcher-action.h +++ b/callouts/nm-dispatcher-api.h diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index 1f99a0b6c1..b1d11daf3d 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -30,7 +30,7 @@ #include <nm-setting-ip6-config.h> #include <nm-setting-connection.h> -#include "nm-dispatcher-action.h" +#include "nm-dispatcher-api.h" #include "nm-utils.h" #include "nm-dispatcher-utils.h" diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher.c index 337a5c616c..e9cd2e74e2 100644 --- a/callouts/nm-dispatcher-action.c +++ b/callouts/nm-dispatcher.c @@ -37,7 +37,7 @@ #include <dbus/dbus-glib.h> -#include "nm-dispatcher-action.h" +#include "nm-dispatcher-api.h" #include "nm-dispatcher-utils.h" #include "nm-glib-compat.h" diff --git a/callouts/org.freedesktop.nm_dispatcher.service.in b/callouts/org.freedesktop.nm_dispatcher.service.in index 9feb3b468b..ff037cca9f 100644 --- a/callouts/org.freedesktop.nm_dispatcher.service.in +++ b/callouts/org.freedesktop.nm_dispatcher.service.in @@ -1,6 +1,6 @@ [D-BUS Service] Name=org.freedesktop.nm_dispatcher -Exec=@libexecdir@/nm-dispatcher.action +Exec=@libexecdir@/nm-dispatcher User=root SystemdService=dbus-org.freedesktop.nm-dispatcher.service diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index 8dd18430ed..a91ae2b27a 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -29,7 +29,7 @@ #include "nm-setting-connection.h" #include "nm-dispatcher-utils.h" #include "nm-dbus-glib-types.h" -#include "nm-dispatcher-action.h" +#include "nm-dispatcher-api.h" #include "nm-utils.h" /*******************************************/ |