udevadm: allow a .device unit to be specified for query and trigger
This is convenient when working with device units in systemd. Instead of converting the systemd unit name to a path to feed to udevadm, udevadm info|trigger can be called directly on the unit name. The man page is reworked a bit to describe the modern syntax with positional arguments first. It's just simpler to use than the positional options.
This commit is contained in:
@@ -440,7 +440,7 @@ int info_main(int argc, char *argv[], void *userdata) {
|
||||
|
||||
r = find_device(argv[optind], NULL, &device);
|
||||
if (r == -EINVAL)
|
||||
return log_error_errno(r, "Bad argument \"%s\", an absolute path in /dev/ or /sys expected: %m",
|
||||
return log_error_errno(r, "Bad argument \"%s\", expected an absolute path in /dev/ or /sys or a unit name: %m",
|
||||
argv[optind]);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Unknown device \"%s\": %m", argv[optind]);
|
||||
|
||||
+19
-6
@@ -6,18 +6,31 @@
|
||||
#include "device-private.h"
|
||||
#include "path-util.h"
|
||||
#include "udevadm-util.h"
|
||||
#include "unit-name.h"
|
||||
|
||||
int find_device(const char *id, const char *prefix, sd_device **ret) {
|
||||
_cleanup_free_ char *buf = NULL;
|
||||
_cleanup_free_ char *path = NULL;
|
||||
int r;
|
||||
|
||||
assert(id);
|
||||
assert(ret);
|
||||
|
||||
if (prefix && !path_startswith(id, prefix)) {
|
||||
buf = path_join(prefix, id);
|
||||
if (!buf)
|
||||
return -ENOMEM;
|
||||
id = buf;
|
||||
if (prefix) {
|
||||
if (!path_startswith(id, prefix)) {
|
||||
id = path = path_join(prefix, id);
|
||||
if (!path)
|
||||
return -ENOMEM;
|
||||
}
|
||||
} else {
|
||||
/* In cases where the argument is generic (no prefix specified),
|
||||
* check if the argument looks like a device unit name. */
|
||||
if (unit_name_is_valid(id, UNIT_NAME_PLAIN) &&
|
||||
unit_name_to_type(id) == UNIT_DEVICE) {
|
||||
r = unit_name_to_path(id, &path);
|
||||
if (r < 0)
|
||||
return log_debug_errno(r, "Failed to convert \"%s\" to a device path: %m", id);
|
||||
id = path;
|
||||
}
|
||||
}
|
||||
|
||||
if (path_startswith(id, "/sys/"))
|
||||
|
||||
Reference in New Issue
Block a user