X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Fsysfs-show.c;h=3c03bd1f2e78f57480b4198d94b3fe3b49caeb36;hp=da34c3ade84acac215aae9f9cb5c6024b70be6b3;hb=2d96536dd7ef371c94be70cd9fb0fcbc0e5a0329;hpb=d239d84aa384a532e1056ec1d09fef16d843b8eb diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index da34c3ade..3c03bd1f2 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -45,7 +45,7 @@ static int show_sysfs_one( struct udev_device *d; const char *sn, *name, *sysfs, *subsystem, *sysname; char *l, *k; - bool is_master, uaccess; + bool is_master; sysfs = udev_list_entry_get_name(*item); if (!path_startswith(sysfs, sub)) @@ -68,8 +68,7 @@ static int show_sysfs_one( continue; } - is_master = udev_device_has_tag(d, "seat-master"); - uaccess = udev_device_has_tag(d, "uaccess"); + is_master = udev_device_has_tag(d, "master-of-seat"); name = udev_device_get_sysattr_value(d, "name"); if (!name) @@ -114,8 +113,8 @@ static int show_sysfs_one( free(k); if (asprintf(&l, - "%s%s%s:%s%s%s%s", - is_master ? "[MASTER] " : "", uaccess ? "[ACL] " : "", + "%s%s:%s%s%s%s", + is_master ? "[MASTER] " : "", subsystem, sysname, name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) { udev_device_unref(d);