From 131206de786cd5c4d82d7a49ec1f6e562775022d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 20 May 2022 10:25:12 +0200 Subject: [PATCH] core/device: do not downgrade device state if it is already enumerated On switching root, a device may have a persistent databse. In that case, Device.enumerated_found may have DEVICE_FOUND_UDEV flag, and it is not necessary to downgrade the Device.deserialized_found and Device.deserialized_state. Otherwise, the state of the device unit may be changed plugged -> dead -> plugged, if the device has not been mounted. Fixes #23429. [mwilck: cherry-picked from #23437] (cherry picked from commit 4fc69e8a0949c2537019466f839d9b7aee5628c9) --- src/core/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/device.c b/src/core/device.c index 8728630523..fcde8a420e 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -201,7 +201,8 @@ static int device_coldplug(Unit *u) { * Of course, deserialized parameters may be outdated, but the unit state can be adjusted later by * device_catchup() or uevents. */ - if (!m->honor_device_enumeration && !MANAGER_IS_USER(m)) { + if (!m->honor_device_enumeration && !MANAGER_IS_USER(m) && + !FLAGS_SET(d->enumerated_found, DEVICE_FOUND_UDEV)) { found &= ~DEVICE_FOUND_UDEV; /* ignore DEVICE_FOUND_UDEV bit */ if (state == DEVICE_PLUGGED) state = DEVICE_TENTATIVE; /* downgrade state */