proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-09 17:19:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rules: move ID_SMARTCARD_READER definition to a <70 configuration

Browse Source 
Closes: #978011
This commit is contained in:
Michael Biebl 2021-03-06 21:55:57 +01:00
parent 2ab3ec0387
commit 7d68acb67f
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
debian/patches/rules-Move-ID_SMARTCARD_READER-definition-to-a-70-configu.patch vendored Normal file
View File

@ -0,0 +1,41 @@
From: Vincent Pelletier <plr.vincent@gmail.com>
Date: Sat, 27 Feb 2021 00:17:06 +0000
Subject: rules: Move ID_SMARTCARD_READER definition to a <70 configuration.
70-uaccess.rules sets the uaccess tag on devices with ID_SMARTCARD_READER
set, but it is set in 99-systemd.rules .
Move this to a 60-*.rules which already matches USB CCID class, factorising
the matching, so 70-uaccess.rules sets up these devices as expected.
(cherry picked from commit dbdcd51f78bde5e9033d98d61bbb750c868bde9d)
---
rules.d/60-fido-id.rules | 3 ++-
rules.d/99-systemd.rules.in | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules.d/60-fido-id.rules b/rules.d/60-fido-id.rules
index c7d5d2f..48c259e 100644
--- a/rules.d/60-fido-id.rules
+++ b/rules.d/60-fido-id.rules
@@ -7,7 +7,8 @@ SUBSYSTEM=="hidraw", IMPORT{program}="fido_id"
# Tag any form of security token as such
ENV{ID_SECURITY_TOKEN}=="1", TAG+="security-device"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0b????:*", ENV{ID_SMARTCARD_READER}="1"
# Tag any CCID device (i.e. Smartcard Reader) as security token
-SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="0b", TAG+="security-device"
+ENV{ID_SMARTCARD_READER}=="1", TAG+="security-device"
LABEL="fido_id_end"
diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
index 7c22eef..0abca6e 100644
--- a/rules.d/99-systemd.rules.in
+++ b/rules.d/99-systemd.rules.in
@@ -49,7 +49,6 @@ SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsys
SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsystem/bluetooth/devices/%k", \
ENV{SYSTEMD_WANTS}+="bluetooth.target", ENV{SYSTEMD_USER_WANTS}+="bluetooth.target"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0b????:*", ENV{ID_SMARTCARD_READER}="1"
ENV{ID_SMARTCARD_READER}=="?*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="smartcard.target", ENV{SYSTEMD_USER_WANTS}+="smartcard.target"
SUBSYSTEM=="sound", KERNEL=="controlC*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sound.target", ENV{SYSTEMD_USER_WANTS}+="sound.target"

1
debian/patches/series vendored
View File

@ -2,6 +2,7 @@ Add-helper-for-case-independent-string-equality-checks.patch
localed-Run-locale-gen-if-available-to-generate-missing-l.patch
core-fix-mtime-calculation-of-dropin-files.patch
analyze-slightly-reword-PrivateTmp-message.patch
rules-Move-ID_SMARTCARD_READER-definition-to-a-70-configu.patch
debian/Use-Debian-specific-config-files.patch
debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
debian/Make-run-lock-tmpfs-an-API-fs.patch