chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: relabel both before and after a mount, just in case
[elogind.git]
/
src
/
device.c
diff --git
a/src/device.c
b/src/device.c
index 7cb4ff699e51a9c723f5a1d7907df1a79ed36c20..41c96cef03f0c2344df2a8302977862275534676 100644
(file)
--- a/
src/device.c
+++ b/
src/device.c
@@
-29,6
+29,7
@@
#include "log.h"
#include "unit-name.h"
#include "dbus-device.h"
#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,
static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
[DEVICE_DEAD] = UNIT_INACTIVE,
@@
-65,7
+66,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
/* In contrast to all other unit types we timeout jobs waiting
* for devices by default. This is because they otherwise wait
- * indefin
e
tely for plugged in devices, something which cannot
+ * indefin
i
tely 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;
* happen for the other units since their operations time out
* anyway. */
d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
@@
-92,7
+93,7
@@
static void device_set_state(Device *d, DeviceState state) {
device_state_to_string(old_state),
device_state_to_string(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) {
}
static int device_coldplug(Unit *u) {
@@
-468,6
+469,11
@@
static int device_enumerate(Manager *m) {
goto fail;
}
goto fail;
}
+ /* 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;
goto fail;
if (udev_monitor_filter_add_match_tag(m->udev_monitor, "systemd") < 0) {
r = -ENOMEM;
goto fail;
@@
-521,13
+527,24
@@
fail:
void device_fd_event(Manager *m, int events) {
struct udev_device *dev;
int r;
void device_fd_event(Manager *m, int events) {
struct udev_device *dev;
int r;
- const char *action;
+ const char *action
, *ready
;
assert(m);
assert(m);
- assert(events == EPOLLIN);
+
+ if (events != EPOLLIN) {
+ static RATELIMIT_DEFINE(limit, 10*USEC_PER_SEC, 5);
+
+ if (!ratelimit_test(&limit))
+ log_error("Failed to get udev event: %m");
+ if (!(events & EPOLLIN))
+ return;
+ }
if (!(dev = udev_monitor_receive_device(m->udev_monitor))) {
if (!(dev = udev_monitor_receive_device(m->udev_monitor))) {
- log_error("Failed to receive device.");
+ /*
+ * libudev might filter-out devices which pass the bloom filter,
+ * so getting NULL here is not necessarily an error
+ */
return;
}
return;
}
@@
-536,7
+553,9
@@
void device_fd_event(Manager *m, int events) {
goto fail;
}
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;
if ((r = device_process_removed_device(m, dev)) < 0) {
log_error("Failed to process udev device event: %s", strerror(-r));
goto fail;
@@
-562,7
+581,6
@@
DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState);
const UnitVTable device_vtable = {
.suffix = ".device",
const UnitVTable device_vtable = {
.suffix = ".device",
- .no_requires = true,
.no_instances = true,
.no_snapshots = true,
.no_isolate = true,
.no_instances = true,
.no_snapshots = true,
.no_isolate = true,