forked from pool/systemd
429339fe2c
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From 955f9bde9ba6d9f0a7364d5cb7c0cee951d5caab Mon Sep 17 00:00:00 2001
|
|
From: Oleg Samarin <osamarin68@gmail.com>
|
|
Date: Sat, 5 Jan 2013 20:33:37 +0400
|
|
Subject: [PATCH] logind: Capability of making seats without framebuffer
|
|
devices
|
|
|
|
file logind.c: The seat is now activated by any device with udev tag "seat-master"
|
|
file 71-seat.rules.in: All framebuffer devices have this tag
|
|
---
|
|
src/login/71-seat.rules.in | 2 +-
|
|
src/login/logind.c | 12 ++----------
|
|
2 files changed, 3 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in
|
|
index f554d7f..4f1a9a5 100644
|
|
--- a/src/login/71-seat.rules.in
|
|
+++ b/src/login/71-seat.rules.in
|
|
@@ -10,7 +10,7 @@ ACTION=="remove", GOTO="seat_end"
|
|
TAG=="uaccess", SUBSYSTEM!="sound", TAG+="seat"
|
|
SUBSYSTEM=="sound", KERNEL=="card*", TAG+="seat"
|
|
SUBSYSTEM=="input", KERNEL=="input*", TAG+="seat"
|
|
-SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="seat"
|
|
+SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="seat", TAG+="seat-master"
|
|
SUBSYSTEM=="usb", ATTR{bDeviceClass}=="09", TAG+="seat"
|
|
|
|
# 'Plugable' USB hub, sound, network, graphics adapter
|
|
diff --git a/src/login/logind.c b/src/login/logind.c
|
|
index 6438631..6776229 100644
|
|
--- a/src/login/logind.c
|
|
+++ b/src/login/logind.c
|
|
@@ -459,11 +459,7 @@ int manager_enumerate_devices(Manager *m) {
|
|
goto finish;
|
|
}
|
|
|
|
- r = udev_enumerate_add_match_subsystem(e, "graphics");
|
|
- if (r < 0)
|
|
- goto finish;
|
|
-
|
|
- r = udev_enumerate_add_match_tag(e, "seat");
|
|
+ r = udev_enumerate_add_match_tag(e, "seat-master");
|
|
if (r < 0)
|
|
goto finish;
|
|
|
|
@@ -1295,11 +1291,7 @@ static int manager_connect_udev(Manager *m) {
|
|
if (!m->udev_seat_monitor)
|
|
return -ENOMEM;
|
|
|
|
- r = udev_monitor_filter_add_match_tag(m->udev_seat_monitor, "seat");
|
|
- if (r < 0)
|
|
- return r;
|
|
-
|
|
- r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_seat_monitor, "graphics", NULL);
|
|
+ r = udev_monitor_filter_add_match_tag(m->udev_seat_monitor, "seat-master");
|
|
if (r < 0)
|
|
return r;
|
|
|
|
--
|
|
1.7.10.4
|
|
|