#include "device.h"
#include "strv.h"
#include "log.h"
+#include "unit-name.h"
static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
[DEVICE_DEAD] = UNIT_INACTIVE,
d->state = state;
if (state != old_state)
- log_debug("%s changed %s → %s", unit_id(UNIT(d)), state_string_table[old_state], state_string_table[state]);
+ log_debug("%s changed %s → %s", UNIT(d)->meta.id, state_string_table[old_state], state_string_table[state]);
unit_notify(UNIT(d), state_translation_table[old_state], state_translation_table[state]);
}
assert(dn);
assert(dn[0] == '/');
- if (!(e = unit_name_escape_path(dn+1, ".device")))
+ if (!(e = unit_name_build_escape(dn+1, NULL, ".device")))
return -ENOMEM;
r = unit_add_name(u, e);
assert(dn[0] == '/');
assert(_u);
- if (!(e = unit_name_escape_path(dn+1, ".device")))
+ if (!(e = unit_name_build_escape(dn+1, NULL, ".device")))
return -ENOMEM;
u = manager_get_unit(m, e);
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;
Unit *u = NULL;
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);
- 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 ((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;
-
- /* Ok, seems kinda interesting. Now, let's see if this one
- * already exists. */
-
if ((r = device_find_escape_name(m, sysfs, &u)) < 0)
return r;
goto fail;
}
- r = unit_add_dependency_by_name(u, UNIT_WANTS, e);
+ r = unit_add_dependency_by_name(u, UNIT_WANTS, NULL, e);
free(e);
if (r < 0)
return -ENOMEM;
assert(sysfs[0] == '/');
- if (!(e = unit_name_escape_path(sysfs+1, ".device")))
+ if (!(e = unit_name_build_escape(sysfs+1, NULL, ".device")))
return -ENOMEM;
u = manager_get_unit(m, e);
const UnitVTable device_vtable = {
.suffix = ".device",
+ .no_requires = true,
+ .no_instances = true,
+
.init = device_init,
.load = unit_load_fragment_and_dropin_optional,
.done = device_done,