if (state != old_state)
log_debug("%s changed %s -> %s",
- UNIT(d)->meta.id,
+ d->meta.id,
device_state_to_string(old_state),
device_state_to_string(state));
}
static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) {
- const char *dn, *wants, *sysfs, *expose, *model, *alias;
+ const char *dn, *wants, *sysfs, *model, *alias;
Unit *u = NULL;
int r;
char *w, *state;
size_t l;
bool delete;
struct udev_list_entry *item = NULL, *first = NULL;
- int b;
assert(m);
if (!(sysfs = udev_device_get_syspath(dev)))
return -ENOMEM;
- if (!(expose = udev_device_get_property_value(dev, "SYSTEMD_EXPOSE")))
- return 0;
-
- if ((b = parse_boolean(expose)) < 0) {
- log_error("Failed to parse SYSTEMD_EXPOSE udev property for device %s: %s", sysfs, expose);
- return 0;
- }
-
- if (!b)
- return 0;
-
/* Check whether this entry is even relevant for us. */
dn = udev_device_get_devnode(dev);
wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS");
goto fail;
if (wants) {
- FOREACH_WORD(w, l, wants, state) {
+ FOREACH_WORD_QUOTED(w, l, wants, state) {
char *e;
if (!(e = strndup(w, l))) {
goto fail;
}
+ if (udev_monitor_filter_add_match_tag(m->udev_monitor, "systemd") < 0) {
+ r = -ENOMEM;
+ goto fail;
+ }
+
if (udev_monitor_enable_receiving(m->udev_monitor) < 0) {
r = -EIO;
goto fail;
r = -ENOMEM;
goto fail;
}
+ if (udev_enumerate_add_match_tag(e, "systemd") < 0) {
+ r = -EIO;
+ goto fail;
+ }
if (udev_enumerate_scan_devices(e) < 0) {
r = -EIO;