chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bfb7ec0
)
loginctl: show seat master and uaccess devices in seat-status output
author
Lennart Poettering
<lennart@poettering.net>
Thu, 24 Jan 2013 04:47:37 +0000
(
05:47
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 24 Jan 2013 04:47:37 +0000
(
05:47
+0100)
src/login/sysfs-show.c
patch
|
blob
|
history
diff --git
a/src/login/sysfs-show.c
b/src/login/sysfs-show.c
index d113ec3e4394414fe9ff99d2eff89bf866c0c0b7..da34c3ade84acac215aae9f9cb5c6024b70be6b3 100644
(file)
--- a/
src/login/sysfs-show.c
+++ b/
src/login/sysfs-show.c
@@
-45,6
+45,7
@@
static int show_sysfs_one(
struct udev_device *d;
const char *sn, *name, *sysfs, *subsystem, *sysname;
char *l, *k;
struct udev_device *d;
const char *sn, *name, *sysfs, *subsystem, *sysname;
char *l, *k;
+ bool is_master, uaccess;
sysfs = udev_list_entry_get_name(*item);
if (!path_startswith(sysfs, sub))
sysfs = udev_list_entry_get_name(*item);
if (!path_startswith(sysfs, sub))
@@
-60,13
+61,16
@@
static int show_sysfs_one(
if (isempty(sn))
sn = "seat0";
if (isempty(sn))
sn = "seat0";
- /*
fixme,
also check for tag 'seat' here */
+ /*
Explicitly
also check for tag 'seat' here */
if (!streq(seat, sn) || !udev_device_has_tag(d, "seat")) {
udev_device_unref(d);
*item = udev_list_entry_get_next(*item);
continue;
}
if (!streq(seat, sn) || !udev_device_has_tag(d, "seat")) {
udev_device_unref(d);
*item = udev_list_entry_get_next(*item);
continue;
}
+ 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)
name = udev_device_get_sysattr_value(d, "id");
name = udev_device_get_sysattr_value(d, "name");
if (!name)
name = udev_device_get_sysattr_value(d, "id");
@@
-110,7
+114,8
@@
static int show_sysfs_one(
free(k);
if (asprintf(&l,
free(k);
if (asprintf(&l,
- "(%s:%s)%s%s%s",
+ "%s%s%s:%s%s%s%s",
+ is_master ? "[MASTER] " : "", uaccess ? "[ACL] " : "",
subsystem, sysname,
name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
udev_device_unref(d);
subsystem, sysname,
name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
udev_device_unref(d);