From 036d2eefaee2b64e7946ef19de9b0b94b60e8955 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 17 Apr 2018 15:12:06 +0200 Subject: device: skip deserialization of device units when udevd is not running Do not try to party initialize a device during deserialization if it's not known by udev (anymore) and therefore hasn't been seen during device enumeration. The device unit in this case has not been initialized properly and setting it in the "plugged" state can be confusing. Actually this happens during every boots when PID switches to the new rootfs: PID is reexecuted and enumerates devices but since udev is not running, the list of enumerated devices is empty. --- src/core/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/core/device.c') diff --git a/src/core/device.c b/src/core/device.c index aafc97ffd4..12dccdb975 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -173,6 +173,18 @@ static int device_deserialize_item(Unit *u, const char *key, const char *value, assert(value); assert(fds); + /* The device was known at the time units were serialized but it's not + * anymore at the time units are deserialized. This happens when PID1 is + * re-executed after having switched to the new rootfs: devices were + * enumerated but udevd wasn't running yet thus the list of devices + * (handled by systemd) to initialize was empty. In such case we wait + * for the device events to be re-triggered by udev so device units are + * properly re-initialized. */ + if (d->found == DEVICE_NOT_FOUND) { + assert(d->sysfs == NULL); + return 0; + } + if (streq(key, "state")) { DeviceState state; -- cgit v1.2.3