Disable logitech-updater for Logitech TAP device.
TAP firmware upgrade is currently not available/supported.
So removing udev rule for TAP resolves multiple TAP related bugs.
udev rule disabled/removed for following Logitech device:
- TAP
udev rule enabled/re-added for following Logitech devices:
- PTZ Pro
- PTZ Pro 2
- Meetup
- Rally
BUG=chromium:1139065
TEST=Update /lib/udev/rules.d/99-logitech-updater.rules, reboot
Change-Id: Ic4868814163e1e88db5d9ec1ce487244edf0a8bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/logitech-updater/+/2489141
Reviewed-by: Matthew Ziegelbaum <ziegs@chromium.org>
Reviewed-by: Joe Tessler <jrt@chromium.org>
Commit-Queue: Joe Tessler <jrt@chromium.org>
Tested-by: Joe Tessler <jrt@chromium.org>
diff --git a/conf/99-logitech-updater.rules b/conf/99-logitech-updater.rules
index 015ecf3..0048f78 100644
--- a/conf/99-logitech-updater.rules
+++ b/conf/99-logitech-updater.rules
@@ -1,57 +1,38 @@
# Copyright 2018 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-
# PTZ Pro 2 video device rule.
-# TODO(b/168058961): Restore PTZ Pro 2 firmware updater
SUBSYSTEM=="video4linux", ACTION=="add", ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="085f", \
-OWNER="cfm-firmware-updaters", GROUP="video", MODE="0664"
-
+OWNER="cfm-firmware-updaters", GROUP="video", MODE="0664", \
+RUN+="/sbin/minijail0 -u cfm-firmware-updaters -G -e -i -l -r -n -p -v -S /usr/share/policy/logitech-updater-seccomp.policy /usr/sbin/logitech-updater --lock --delay=5 --update_components --id=1"
# PTZ Pro video device rule.
-# TODO(b/168058961): Restore PTZ Pro firmware updater
SUBSYSTEM=="video4linux", ACTION=="add", ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="0853", \
-OWNER="cfm-firmware-updaters", GROUP="video", MODE="0664"
-
+OWNER="cfm-firmware-updaters", GROUP="video", MODE="0664", \
+RUN+="/sbin/minijail0 -u cfm-firmware-updaters -G -e -i -l -r -n -p -v -S /usr/share/policy/logitech-updater-seccomp.policy /usr/sbin/logitech-updater --lock --delay=10 --update_components --id=2"
# MeetUp/Logi Group DFU audio device rule.
-# TODO(b/168058961): Restore Meetup firmware updater
SUBSYSTEM=="hidraw", ACTION=="add", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="0859", \
-OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664"
-
+OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664", \
+RUN+="/sbin/minijail0 -u cfm-firmware-updaters -G -e -i -l -r -n -p -v -S /usr/share/policy/logitech-updater-seccomp.policy /usr/sbin/logitech-updater --lock --delay=5 --update_dfu_audio --id=3"
# MeetUp HID audio device rule.
-# TODO(b/168058961): Restore Meetup firmware updater
SUBSYSTEM=="hidraw", ACTION=="add", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="0867", \
-OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664"
-
+OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664", \
+RUN+="/sbin/minijail0 -u cfm-firmware-updaters -G -e -i -l -r -n -p -v -S /usr/share/policy/logitech-updater-seccomp.policy /usr/sbin/logitech-updater --lock --delay=5 --update_components --id=4"
# MeetUp video device rule
SUBSYSTEM=="video4linux", ACTION=="add", ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="0866", \
OWNER="cfm-firmware-updaters", GROUP="video", MODE="0664"
-
# Rally HID audio device rule.
SUBSYSTEM=="hidraw", ACTION=="add", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="0885", \
OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664"
-
# Rally DFU audio device rule.
SUBSYSTEM=="hidraw", ACTION=="add", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="0886", \
OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664"
-
# Rally video device rule.
SUBSYSTEM=="video4linux", ACTION=="add", ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="0881", \
OWNER="cfm-firmware-updaters", GROUP="video", MODE="0664"
-
# Rally TableHub device rule.
-# TODO(b/168058961): Restore Rally TableHub firmware updater
SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="046d", ATTR{idProduct}=="088f", \
-OWNER="cfm-firmware-updaters", MODE="0664"
-
-# TAP Flare PIR sensor rule.
-# TODO(b/168058961): Restore TAP Flare PIR sensor firmware updater
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="046d", ATTR{idProduct}=="0872", \
-OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664"
-
-# TAP HDMI Capture device rule.
-# TODO(b/168058961): Restore TAP HDMI Capture device firmware updater
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="046d", ATTR{idProduct}=="0876", \
-OWNER="cfm-firmware-updaters", GROUP="cfm-firmware-updaters", MODE="0664"
+OWNER="cfm-firmware-updaters", MODE="0664", \
+RUN+="/sbin/minijail0 -u cfm-firmware-updaters -G -e -i -l -r -n -p -v -S /usr/share/policy/logitech-updater-seccomp.policy /usr/sbin/logitech-updater --lock --delay=20 --update_components --id=5"
# Rally Mic rule for unique ALSA id.
SUBSYSTEM=="sound", ACTION=="add", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="0885", ATTR{id}="RallyMic"