diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-22 17:31:06 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-23 15:13:02 +0100 |
| commit | 324fd64b0441fac9547e30714577ef08750fe3b9 (patch) | |
| tree | b2ee0f6d674af5ea3cb0a71ae9ba8bd043cfc239 /data | |
| parent | f7a5d09aba868ac5195951322725e3a78e2c5c5f (diff) | |
data: move OLPC MESH udev rules away from callouts
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.
Diffstat (limited to 'data')
| -rw-r--r-- | data/77-nm-olpc-mesh.rules | 6 | ||||
| -rw-r--r-- | data/Makefile.am | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/data/77-nm-olpc-mesh.rules b/data/77-nm-olpc-mesh.rules new file mode 100644 index 000000000..a1a1554c2 --- /dev/null +++ b/data/77-nm-olpc-mesh.rules @@ -0,0 +1,6 @@ +# do not edit this file, it will be overwritten on update + +# The fact that this device is driven by libertas is not currently exposed +# in the sysfs tree..? +KERNEL=="msh*", SUBSYSTEM=="net", DRIVERS=="usb", ATTRS{idVendor}=="1286", ATTRS{idProduct}=="2001", ENV{ID_NM_OLPC_MESH}="1" + diff --git a/data/Makefile.am b/data/Makefile.am index bd40089f6..5a95ea2a4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -36,7 +36,9 @@ examples_DATA = server.conf if WITH_UDEV_DIR udevrulesdir = $(UDEV_DIR)/rules.d -udevrules_DATA = 85-nm-unmanaged.rules +udevrules_DATA = \ + 85-nm-unmanaged.rules \ + 77-nm-olpc-mesh.rules endif server.conf: server.conf.in @@ -57,6 +59,7 @@ EXTRA_DIST = \ NetworkManager-dispatcher.service.in \ org.freedesktop.NetworkManager.service.in \ 85-nm-unmanaged.rules \ + 77-nm-olpc-mesh.rules \ server.conf.in CLEANFILES = \ |