From: Lennart Poettering Date: Fri, 25 Jan 2013 03:48:34 +0000 (+0100) Subject: loginctl: don't show [UACCESS] info in device tree X-Git-Tag: v198~412 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5d1fb81b2c602abd2605f6e50810ac7fcb06c024;ds=sidebyside loginctl: don't show [UACCESS] info in device tree As the tree doesn't really necessarily show all device node devices and only those are marked for uaccess it's kinda pointless showing this at all, since it would give a pretty incomplete impression of the uaccess information. --- diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index da34c3ade..fc3af7587 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)) @@ -69,7 +69,6 @@ static int show_sysfs_one( } is_master = udev_device_has_tag(d, "seat-master"); - uaccess = udev_device_has_tag(d, "uaccess"); 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);