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".

diff --git a/TODO b/TODO
index d3731501a24654d5670bd633985500ea1837cc2d..d195137190861f159c31a3f2c49840148745c014 100644 (file)
--- a/TODO
+++ b/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
 
   - 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
 * 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 4f1a9a59a1fef107a5c1ebbc05f53c1a2c9f952b..a064de4b5e7cc08b4a72c2d92add7e15a876757f 100644 (file)
--- 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"
 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
 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 be793e2a93ca8a8f93cf059a220850d4e30e5f34..680bc1fcdff07905e88dd63c903468d0399345ee 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -461,7 +461,7 @@ int manager_enumerate_devices(Manager *m) {
                 goto finish;
         }
 
                 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;
 
         if (r < 0)
                 goto finish;
 


@@ -1293,7 +1293,7 @@ static int manager_connect_udev(Manager *m) {
         if (!m->udev_seat_monitor)
                 return -ENOMEM;
 
         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;
 
         if (r < 0)
                 return r;
 

diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index fc3af75876ba512c81f4bc9f6590079859f105a7..3c03bd1f2e78f57480b4198d94b3fe3b49caeb36 100644 (file)
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -68,7 +68,7 @@ static int show_sysfs_one(
                         continue;
                 }
 
                         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)
 
                 name = udev_device_get_sysattr_value(d, "name");
                 if (!name)