Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:add-all-rules into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:vivid/master

[Alfonso Sanchez-Beato]

Ignore BLIP camera by using udev rules (LP: #1615853)

Ignore BLIP camera by using udev rules (LP: #1615853)

[Matteo Croce (teknoraver)]

review: Approve

[Tony Espy (awe)]

Looks good to me!

review: Approve

diff --git a/bin/modemmanager b/bin/modemmanager
index e6de1de..3aa78c3 100755
--- a/bin/modemmanager
+++ b/bin/modemmanager
@@ -7,10 +7,8 @@ set -x
 cp $SNAP_APP_PATH/etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf \
     /etc/dbus-1/system.d/$SNAP_APP.conf
 
-# We need a specific udev rule in place in order to tag all
-# devices we might be interested in with a property so we
-# can iterate them on startup.
-cp $SNAP_APP_PATH/conf/80-mm-candidate.rules /etc/udev/rules.d/
+# Copy around mm udev rules
+cp $SNAP_APP_PATH/conf/*.rules /etc/udev/rules.d/
 # Reload all device information so that our new rule gets applied
 udevadm trigger
 
@@ -33,6 +31,5 @@ $SNAP_APP_PATH/usr/sbin/ModemManager \
     "$@"
 
 # Cleanup everything we copied into the system
-rm /etc/udev/rules.d/80-mm-candidate.rules \
-    /etc/udev/rules.d/77-mm-telit.rules
+rm /etc/udev/rules.d/*-mm-*rules
 udevadm trigger
diff --git a/conf/77-mm-usb-device-blacklist.rules b/conf/77-mm-usb-device-blacklist.rules
 new file mode 100644
index 0000000..9cfc805
--- /dev/null
+++ b/conf/77-mm-usb-device-blacklist.rules
@@ -0,0 +1,10 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add|change|move", GOTO="mm_usb_device_blacklist_end"
+SUBSYSTEM!="usb", GOTO="mm_usb_device_blacklist_end"
+ENV{DEVTYPE}!="usb_device",  GOTO="mm_usb_device_blacklist_end"
+
+# Analog Devices BLIP camera
+ATTRS{idVendor}=="064b", ATTRS{idProduct}=="7823", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+LABEL="mm_usb_device_blacklist_end"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f5b8d5c..f023777 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -73,7 +73,7 @@ parts:
       bin/dnsmasq: bin/dnsmasq
       conf/NetworkManager.conf: etc/NetworkManager/NetworkManager.conf
       conf/dnsmasq-dbus.conf: conf/dnsmasq-dbus.conf
-      conf/80-mm-candidate.rules: conf/80-mm-candidate.rules
+      conf/*.rules: conf/
 
   networkmanager:
     plugin: x-custom