#include "strv.h"
#include "log.h"
#include "unit-name.h"
+#include "dbus-device.h"
static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
[DEVICE_DEAD] = UNIT_INACTIVE,
return 0;
}
-static bool devnode_is_api(const char *node) {
- unsigned i;
-
- static const char * const table[] = {
- "/dev/null",
- "/dev/zero",
- "/dev/urandom",
- "/dev/random",
- "/dev/port",
- "/dev/oldmem",
- "/dev/full",
- "/dev/kmsg",
- "/dev/mem"
- };
-
- for (i = 0; i < ELEMENTSOF(table); i++)
- if (streq(table[i], node))
- return true;
-
- return false;
-}
-
static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) {
- const char *dn, *names, *wants, *sysfs, *expose, *model;
+ const char *dn, *wants, *sysfs, *expose, *model;
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;
- /* Check whether this entry is even relevant for us. */
- dn = udev_device_get_devnode(dev);
- expose = udev_device_get_property_value(dev, "SYSTEMD_EXPOSE");
- names = udev_device_get_property_value(dev, "SYSTEMD_NAMES");
- wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS");
-
- if (expose) {
- int b;
+ 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 = 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;
- } else
- if ((!dn || devnode_is_api(dn)) && !names && !wants)
- return 0;
+ if (!b)
+ return 0;
- /* Ok, seems kinda interesting. Now, let's see if this one
- * already exists. */
+ /* Check whether this entry is even relevant for us. */
+ dn = udev_device_get_devnode(dev);
+ wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS");
if ((r = device_find_escape_name(m, sysfs, &u)) < 0)
return r;
if ((r = unit_set_description(u, dn)) < 0)
goto fail;
- /* We don't remove names that are gone. But that should be
- * fine and should probably be fixed only on a configuration
- * refresh. */
-
- if (names) {
- FOREACH_WORD(w, l, names, state) {
- char *e;
-
- if (!(e = strndup(w, l))) {
- r = -ENOMEM;
- goto fail;
- }
-
- r = unit_add_name(u, e);
- free(e);
-
- if (r < 0 && r != -EEXIST)
- goto fail;
- }
- }
-
if (wants) {
FOREACH_WORD(w, l, wants, state) {
char *e;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_watch.fd, &ev) < 0)
return -errno;
- /* if (!(e = udev_enumerate_new(m->udev))) { */
- /* r = -ENOMEM; */
- /* goto fail; */
- /* } */
+ if (!(e = udev_enumerate_new(m->udev))) {
+ r = -ENOMEM;
+ goto fail;
+ }
- /* if (udev_enumerate_scan_devices(e) < 0) { */
- /* r = -EIO; */
- /* goto fail; */
- /* } */
+ if (udev_enumerate_scan_devices(e) < 0) {
+ r = -EIO;
+ goto fail;
+ }
- /* first = udev_enumerate_get_list_entry(e); */
- /* udev_list_entry_foreach(item, first) */
- /* device_process_path(m, udev_list_entry_get_name(item), false); */
+ first = udev_enumerate_get_list_entry(e);
+ udev_list_entry_foreach(item, first)
+ device_process_path(m, udev_list_entry_get_name(item), false);
- /* udev_enumerate_unref(e); */
+ udev_enumerate_unref(e);
return 0;
fail:
.no_requires = true,
.no_instances = true,
+ .no_snapshots = true,
.init = device_init,
.load = unit_load_fragment_and_dropin_optional,
.active_state = device_active_state,
.sub_state_to_string = device_sub_state_to_string,
+ .bus_message_handler = bus_device_message_handler,
+
.enumerate = device_enumerate,
.shutdown = device_shutdown
};