diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | src/login/71-seat.rules.in | 2 | ||||
| -rw-r--r-- | src/login/logind.c | 4 | ||||
| -rw-r--r-- | src/login/sysfs-show.c | 2 |
4 files changed, 4 insertions, 7 deletions
@@ -49,9 +49,6 @@ Fedora 19: - localectl: add listing support for X11 keymaps, by parsing /usr/share/X11/xkb/rules/xorg.lst - localectl: support new converted x11→console keymaps -* The tag "seat-master" in udev is badly named, as it might conflict with - actual seat names. - * logind: Class property should probably know "background" or so as value for cron jobs, and the inhibition checks should filter those out too. * We should not set KDSKBMODE to K_UNICODE in vconsole-setup if the diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in index 4f1a9a59a1..a064de4b5e 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", TAG+="seat-master" +SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="seat", TAG+="master-of-seat" 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 be793e2a93..680bc1fcdf 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -461,7 +461,7 @@ int manager_enumerate_devices(Manager *m) { goto finish; } - r = udev_enumerate_add_match_tag(e, "seat-master"); + r = udev_enumerate_add_match_tag(e, "master-of-seat"); if (r < 0) goto finish; @@ -1293,7 +1293,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-master"); + r = udev_monitor_filter_add_match_tag(m->udev_seat_monitor, "master-of-seat"); if (r < 0) return r; diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index fc3af75876..3c03bd1f2e 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -68,7 +68,7 @@ static int show_sysfs_one( continue; } - is_master = udev_device_has_tag(d, "seat-master"); + is_master = udev_device_has_tag(d, "master-of-seat"); name = udev_device_get_sysattr_value(d, "name"); if (!name) |