mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
dispatcher: rename executable to 'nm-dispatcher'
This commit is contained in:
parent
c93ae45b42
commit
4cc13befd3
|
@ -26,7 +26,7 @@ dbusservice_DATA = \
|
||||||
nm-avahi-autoipd.conf
|
nm-avahi-autoipd.conf
|
||||||
|
|
||||||
libexec_PROGRAMS = \
|
libexec_PROGRAMS = \
|
||||||
nm-dispatcher.action \
|
nm-dispatcher \
|
||||||
nm-avahi-autoipd.action
|
nm-avahi-autoipd.action
|
||||||
|
|
||||||
|
|
||||||
|
@ -38,13 +38,13 @@ nm_avahi_autoipd_action_LDADD = \
|
||||||
$(GLIB_LIBS)
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
|
|
||||||
nm_dispatcher_action_SOURCES = \
|
nm_dispatcher_SOURCES = \
|
||||||
nm-dispatcher-action.c \
|
nm-dispatcher.c \
|
||||||
nm-dispatcher-action.h \
|
nm-dispatcher-api.h \
|
||||||
nm-dispatcher-utils.c \
|
nm-dispatcher-utils.c \
|
||||||
nm-dispatcher-utils.h
|
nm-dispatcher-utils.h
|
||||||
|
|
||||||
nm_dispatcher_action_LDADD = \
|
nm_dispatcher_LDADD = \
|
||||||
$(top_builddir)/libnm-util/libnm-util.la \
|
$(top_builddir)/libnm-util/libnm-util.la \
|
||||||
$(DBUS_LIBS) \
|
$(DBUS_LIBS) \
|
||||||
$(GLIB_LIBS)
|
$(GLIB_LIBS)
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <nm-setting-ip6-config.h>
|
#include <nm-setting-ip6-config.h>
|
||||||
#include <nm-setting-connection.h>
|
#include <nm-setting-connection.h>
|
||||||
|
|
||||||
#include "nm-dispatcher-action.h"
|
#include "nm-dispatcher-api.h"
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
|
|
||||||
#include "nm-dispatcher-utils.h"
|
#include "nm-dispatcher-utils.h"
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include <dbus/dbus-glib.h>
|
#include <dbus/dbus-glib.h>
|
||||||
|
|
||||||
|
|
||||||
#include "nm-dispatcher-action.h"
|
#include "nm-dispatcher-api.h"
|
||||||
#include "nm-dispatcher-utils.h"
|
#include "nm-dispatcher-utils.h"
|
||||||
#include "nm-glib-compat.h"
|
#include "nm-glib-compat.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[D-BUS Service]
|
[D-BUS Service]
|
||||||
Name=org.freedesktop.nm_dispatcher
|
Name=org.freedesktop.nm_dispatcher
|
||||||
Exec=@libexecdir@/nm-dispatcher.action
|
Exec=@libexecdir@/nm-dispatcher
|
||||||
User=root
|
User=root
|
||||||
SystemdService=dbus-org.freedesktop.nm-dispatcher.service
|
SystemdService=dbus-org.freedesktop.nm-dispatcher.service
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include "nm-setting-connection.h"
|
#include "nm-setting-connection.h"
|
||||||
#include "nm-dispatcher-utils.h"
|
#include "nm-dispatcher-utils.h"
|
||||||
#include "nm-dbus-glib-types.h"
|
#include "nm-dbus-glib-types.h"
|
||||||
#include "nm-dispatcher-action.h"
|
#include "nm-dispatcher-api.h"
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
|
|
||||||
/*******************************************/
|
/*******************************************/
|
||||||
|
|
|
@ -441,7 +441,7 @@ fi
|
||||||
%{_bindir}/nm-online
|
%{_bindir}/nm-online
|
||||||
%{_libexecdir}/nm-dhcp-helper
|
%{_libexecdir}/nm-dhcp-helper
|
||||||
%{_libexecdir}/nm-avahi-autoipd.action
|
%{_libexecdir}/nm-avahi-autoipd.action
|
||||||
%{_libexecdir}/nm-dispatcher.action
|
%{_libexecdir}/nm-dispatcher
|
||||||
%dir %{_libdir}/NetworkManager
|
%dir %{_libdir}/NetworkManager
|
||||||
%{_libdir}/NetworkManager/libnm-settings-plugin*.so
|
%{_libdir}/NetworkManager/libnm-settings-plugin*.so
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
|
@ -4,7 +4,7 @@ Description=Network Manager Script Dispatcher Service
|
||||||
[Service]
|
[Service]
|
||||||
Type=dbus
|
Type=dbus
|
||||||
BusName=org.freedesktop.nm_dispatcher
|
BusName=org.freedesktop.nm_dispatcher
|
||||||
ExecStart=@libexecdir@/nm-dispatcher.action
|
ExecStart=@libexecdir@/nm-dispatcher
|
||||||
|
|
||||||
# We want to allow scripts to spawn long-running daemons, so tell
|
# We want to allow scripts to spawn long-running daemons, so tell
|
||||||
# systemd to not clean up when nm-dispatcher exits
|
# systemd to not clean up when nm-dispatcher exits
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "nm-dispatcher.h"
|
#include "nm-dispatcher.h"
|
||||||
#include "nm-dispatcher-action.h"
|
#include "nm-dispatcher-api.h"
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "nm-logging.h"
|
#include "nm-logging.h"
|
||||||
|
|
Loading…
Reference in a new issue