umount: make sure skip_ro is always correctly initialized

[elogind.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 957bc2d6b5ee02104c740ceaa974b0422b46ecaa..ccf2935a91cac4d3d05076c676f3077258c81f8d 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -65,7 +65,7 @@ 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;
@@ -92,7 +92,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) {
@@ -468,8 +468,10 @@ static int device_enumerate(Manager *m) {
                         goto fail;
                 }
 
-                if (udev_monitor_set_receive_buffer_size(m->udev_monitor, 128*1024*1024) < 0)
-                        log_error("Failed to set udev event buffer size.");
+                /* This will fail if we are unprivileged, but that
+                 * should not matter much, as user instances won't run
+                 * during boot. */
+                udev_monitor_set_receive_buffer_size(m->udev_monitor, 128*1024*1024);
 
                 if (udev_monitor_filter_add_match_tag(m->udev_monitor, "systemd") < 0) {
                         r = -ENOMEM;
@@ -524,7 +526,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);
 
@@ -540,7 +542,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;
         }
@@ -550,7 +552,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;