fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 07:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

data: move OLPC MESH udev rules away from callouts

Browse source 
No idea why was it there in the first place.

This also fixes a bug that the rules file was conditionally included in dist
depending on presence of udev dir at configure time.

(cherry picked from commit ceea3c6782)
This commit is contained in:
Lubomir Rintel 2015-01-22 17:31:06 +01:00 • committed by Thomas Haller
parent 5c187b9b1c
commit cf1166f27f
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
callouts/Makefile.am
View file

@ -87,11 +87,6 @@ libtest_dispatcher_envp_la_LIBADD = \
$(GLIB_LIBS) $(GLIB_LIBS)
if WITH_UDEV_DIR
udevrulesdir = $(UDEV_DIR)/rules.d
udevrules_DATA = 77-nm-olpc-mesh.rules
endif
dbusactivationdir = $(datadir)/dbus-1/system-services dbusactivationdir = $(datadir)/dbus-1/system-services
dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in
dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service) dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
@ -115,7 +110,6 @@ CLEANFILES = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA)
EXTRA_DIST = \ EXTRA_DIST = \
$(dbusservice_DATA) \ $(dbusservice_DATA) \
$(udevrules_DATA) \
$(dbusactivation_in_files) \ $(dbusactivation_in_files) \
nm-dispatcher.xml nm-dispatcher.xml

0
callouts/77-nm-olpc-mesh.rules → data/77-nm-olpc-mesh.rules
View file

5
data/Makefile.am
View file

@ -36,7 +36,9 @@ examples_DATA = server.conf
if WITH_UDEV_DIR if WITH_UDEV_DIR
udevrulesdir = $(UDEV_DIR)/rules.d udevrulesdir = $(UDEV_DIR)/rules.d
udevrules_DATA = 85-nm-unmanaged.rules udevrules_DATA = \
85-nm-unmanaged.rules \
77-nm-olpc-mesh.rules
endif endif
server.conf: server.conf.in server.conf: server.conf.in
@ -57,6 +59,7 @@ EXTRA_DIST = \
NetworkManager-dispatcher.service.in \ NetworkManager-dispatcher.service.in \
org.freedesktop.NetworkManager.service.in \ org.freedesktop.NetworkManager.service.in \
85-nm-unmanaged.rules \ 85-nm-unmanaged.rules \
77-nm-olpc-mesh.rules \
server.conf.in server.conf.in
CLEANFILES = \ CLEANFILES = \