service/socket: show main/control pids in dump

[elogind.git] / device.c

diff --git a/device.c b/device.c
index 1b0b50fd4e796752826d79a278c4d322c7430919..d99038f77e72fb3c367468b9b9b943e18f05d623 100644 (file)
--- a/device.c
+++ b/device.c
@@ -49,6 +49,9 @@ static void device_set_state(Device *d, DeviceState state) {
         DeviceState old_state;
         assert(d);
 
+        if (state == d->state)
+                return;
+
         old_state = d->state;
         d->state = state;
 
@@ -112,7 +115,7 @@ static int device_add_escaped_name(Unit *u, const char *dn, bool make_id) {
 }
 
 static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) {
-        const char *dn, *names, *wants, *sysfs;
+        const char *dn, *names, *wants, *sysfs, *expose;
         Unit *u = NULL;
         int r;
         char *e, *w, *state;
@@ -122,20 +125,32 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
 
         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 (!dn && !names && !wants)
-                return 0;
+        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 && !names && !wants)
+                        return 0;
 
         /* Ok, seems kinda interesting. Now, let's see if this one
          * already exists. */
 
-        if (!(sysfs = udev_device_get_syspath(dev)))
-                return -ENOMEM;
-
         assert(sysfs[0] == '/');
         if (!(e = unit_name_escape_path(sysfs+1, ".device")))
                 return -ENOMEM;
@@ -186,8 +201,10 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
 
         if (names) {
                 FOREACH_WORD(w, l, names, state) {
-                        if (!(e = strndup(w, l)))
+                        if (!(e = strndup(w, l))) {
+                                r = -ENOMEM;
                                 goto fail;
+                        }
 
                         r = unit_add_name(u, e);
                         free(e);
@@ -199,8 +216,10 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
 
         if (wants) {
                 FOREACH_WORD(w, l, wants, state) {
-                        if (!(e = strndup(w, l)))
+                        if (!(e = strndup(w, l))) {
+                                r = -ENOMEM;
                                 goto fail;
+                        }
 
                         r = unit_add_dependency_by_name(u, UNIT_WANTS, e);
                         free(e);
@@ -346,8 +365,6 @@ void device_fd_event(Manager *m, int events) {
         assert(m);
         assert(events == EPOLLIN);
 
-        log_debug("got udev event");
-
         if (!(dev = udev_monitor_receive_device(m->udev_monitor))) {
                 log_error("Failed to receive device.");
                 return;
@@ -377,7 +394,7 @@ fail:
 const UnitVTable device_vtable = {
         .suffix = ".device",
 
-        .init = unit_load_fragment_and_dropin,
+        .init = unit_load_fragment_and_dropin_optional,
         .done = device_done,
         .coldplug = device_coldplug,