Merge fd1803144c into a035eaa227

udev: include device-mapper in block device access locking
The boot process may hang while waiting for the encrypted swap device node due to systemd-makefs skipping block device access locking for device-mapper devices.
2025-04-17 15:55:57 +02:00 · 2025-04-10 16:24:24 +08:00
1 changed files with 1 additions and 2 deletions
--- a/src/udev/udev-worker.c
+++ b/src/udev/udev-worker.c
@ -51,12 +51,11 @@ int udev_get_whole_disk(sd_device *dev, sd_device **ret_device, const char **ret
                return log_device_debug_errno(dev, r, "Failed to get sysname: %m");

        /* Exclude the following devices:
-         * For "dm-", see the comment added by e918a1b5a94f270186dca59156354acd2a596494.
         * For "md", see the commit message of 2e5b17d01347d3c3118be2b8ad63d20415dbb1f0,
         * but not sure the assumption is still valid even when partitions are created on the md
         * devices, surprisingly which seems to be possible, see PR #22973.
         * For "drbd", see the commit message of fee854ee8ccde0cd28e0f925dea18cce35f3993d. */
-        if (STARTSWITH_SET(val, "dm-", "md", "drbd"))
+        if (STARTSWITH_SET(val, "md", "drbd"))
                goto irrelevant;

        r = block_device_get_whole_disk(dev, &dev);
Author	SHA1	Message	Date
yukariatlas	e0c2e69539	Merge `fd1803144c` into `a035eaa227`	2025-04-17 15:55:57 +02:00
Chengen Du	fd1803144c	udev: include device-mapper in block device access locking The boot process may hang while waiting for the encrypted swap device node due to systemd-makefs skipping block device access locking for device-mapper devices.	2025-04-10 16:24:24 +08:00