rpms/systemd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert patch to udev rules causing regression with usb hubs

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-02-10 17:23:40 +01:00
parent ced9237a14
commit 6aa6d755fb
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245.patch Normal file
View File

@ -0,0 +1,33 @@
From 99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 10 Feb 2020 17:19:52 +0100
Subject: [PATCH] Revert "Support Plugable UD-PRO8 dock"
This reverts commit 95f2b4dd237faa57fd3e93245d560e47cdedfc2c.
Unfortunately the same usb hub is used in other places, and causes
numerous regressions (#14822,
https://bugzilla.redhat.com/show_bug.cgi?id=1800820). Let's revert
until a non-regressing approach is found.
---
src/login/71-seat.rules.in | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in
index 2a9ddb93aa7..2bbd18363e6 100644
--- a/src/login/71-seat.rules.in
+++ b/src/login/71-seat.rules.in
@@ -32,12 +32,9 @@ SUBSYSTEM=="pci", ENV{ID_PCI_CLASS_FROM_DATABASE}=="Display controller", \
SUBSYSTEM=="drm", KERNEL=="card[0-9]*", TAG+="seat", TAG+="master-of-seat"
SUBSYSTEM=="usb", ATTR{bDeviceClass}=="09", TAG+="seat"
-# 'Plugable UD-160' USB hub, sound, network, graphics adapter
+# 'Plugable' USB hub, sound, network, graphics adapter
SUBSYSTEM=="usb", ATTR{idVendor}=="2230", ATTR{idProduct}=="000[13]", ENV{ID_AUTOSEAT}="1"
-# 'Plugable UD-PRO8' USB hub, sound, network, graphics adapter
-SUBSYSTEM=="usb", ATTR{idVendor}=="1a40", ATTR{idProduct}=="0201", ENV{ID_AUTOSEAT}="1"
-
# qemu (version 2.4+) has a PCI-PCI bridge (-device pci-bridge-seat) to group
# devices belonging to one seat. See:
# http://git.qemu.org/?p=qemu.git;a=blob;f=docs/multiseat.txt

3
systemd.spec
View File

@ -68,6 +68,8 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
# https://bugzilla.redhat.com/show_bug.cgi?id=1738828 # https://bugzilla.redhat.com/show_bug.cgi?id=1738828
Patch0001: https://github.com/keszybz/systemd/commit/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch Patch0001: https://github.com/keszybz/systemd/commit/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch
Patch0010: https://github.com/systemd/systemd/commit/99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245.patch
Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
%ifarch %{ix86} x86_64 aarch64 %ifarch %{ix86} x86_64 aarch64
@ -743,6 +745,7 @@ fi
- Add macro to generate "compat" scriptlets based off sysusers.d format - Add macro to generate "compat" scriptlets based off sysusers.d format
and autogenerate user() and group() virtual provides (#1792462), and autogenerate user() and group() virtual provides (#1792462),
see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format. see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format.
- Revert patch to udev rules causing regression with usb hubs (#1800820).
* Wed Feb 5 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 245~rc1-1 * Wed Feb 5 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 245~rc1-1
- New upstream release, see - New upstream release, see