X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdevice.c;h=64b21903edd848f185f745bd5f58b94d44b23a09;hp=b36bfc1ad185d10b50dd03ec797f5b74dc8634bc;hb=7a6000a68241d23c9f6f6bde47b2cfa9c18189da;hpb=47ae6e6760301ecae086e984b0b23f2db9663b28

diff --git a/src/device.c b/src/device.c
index b36bfc1ad..64b21903e 100644
--- a/src/device.c
+++ b/src/device.c
@@ -29,6 +29,7 @@
 #include "log.h"
 #include "unit-name.h"
 #include "dbus-device.h"
+#include "def.h"
 
 static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
         [DEVICE_DEAD] = UNIT_INACTIVE,
@@ -65,10 +66,13 @@ static void device_init(Unit *u) {
 
         /* In contrast to all other unit types we timeout jobs waiting
          * for devices by default. This is because they otherwise wait
-         * indefinetely for plugged in devices, something which cannot
+         * indefinitely for plugged in devices, something which cannot
          * happen for the other units since their operations time out
          * anyway. */
         d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
+
+        d->meta.ignore_on_isolate = true;
+        d->meta.ignore_on_snapshot = true;
 }
 
 static void device_done(Unit *u) {
@@ -92,7 +96,7 @@ static void device_set_state(Device *d, DeviceState state) {
                           device_state_to_string(old_state),
                           device_state_to_string(state));
 
-        unit_notify(UNIT(d), state_translation_table[old_state], state_translation_table[state]);
+        unit_notify(UNIT(d), state_translation_table[old_state], state_translation_table[state], true);
 }
 
 static int device_coldplug(Unit *u) {
@@ -526,7 +530,7 @@ fail:
 void device_fd_event(Manager *m, int events) {
         struct udev_device *dev;
         int r;
-        const char *action;
+        const char *action, *ready;
 
         assert(m);
 
@@ -542,7 +546,7 @@ void device_fd_event(Manager *m, int events) {
         if (!(dev = udev_monitor_receive_device(m->udev_monitor))) {
                 /*
                  * libudev might filter-out devices which pass the bloom filter,
-                 * so getting NULL here is not neccessarily an error
+                 * so getting NULL here is not necessarily an error
                  */
                 return;
         }
@@ -552,7 +556,9 @@ void device_fd_event(Manager *m, int events) {
                 goto fail;
         }
 
-        if (streq(action, "remove")) {
+        ready = udev_device_get_property_value(dev, "SYSTEMD_READY");
+
+        if (streq(action, "remove") || (ready && parse_boolean(ready) == 0)) {
                 if ((r = device_process_removed_device(m, dev)) < 0) {
                         log_error("Failed to process udev device event: %s", strerror(-r));
                         goto fail;
@@ -579,8 +585,6 @@ const UnitVTable device_vtable = {
         .suffix = ".device",
 
         .no_instances = true,
-        .no_snapshots = true,
-        .no_isolate = true,
 
         .init = device_init,