logind: rename "seat-master" tag to "master-of-seat"
We currently enforce that seats are to be named in the form of "seatXXX", i.e. need to begin with the 4 characters "seat". Thus, "seat-master" would qualify as a seat name. As seat names are frequently used as tags on devices, the "seat-master" tag might hence confuse logind if the user decides to name a seat "seat-master". Hence, avoid any ambuigity: let's rename the "seat-master" tag to "master-of-seat".
This commit is contained in:
parent
eb124a97fb
commit
2d96536dd7
3
TODO
3
TODO
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue