diff --git a/fix-udev-by-partuuid-devlink-missing-for-more-filesystems-on-the-device.patch b/fix-udev-by-partuuid-devlink-missing-for-more-filesystems-on-the-device.patch new file mode 100644 index 0000000000000000000000000000000000000000..146955f4615a7d81b24f39c23440d8c81f588259 --- /dev/null +++ b/fix-udev-by-partuuid-devlink-missing-for-more-filesystems-on-the-device.patch @@ -0,0 +1,26 @@ +From 8ee7956b62977aa2c4818b99aeb46bab85bb4d1d Mon Sep 17 00:00:00 2001 +From: huangwenhua +Date: Mon, 5 Jun 2023 11:27:13 +0800 +Subject: [PATCH] fix udev by-partuuid devlink missing for more + filesystems on the device + +--- + src/udev/udev-builtin-blkid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c +index b1de363..363af43 100644 +--- a/src/udev/udev-builtin-blkid.c ++++ b/src/udev/udev-builtin-blkid.c +@@ -318,7 +318,7 @@ static int builtin_blkid(sd_device *dev, int argc, char *argv[], bool test) { + log_device_debug(dev, "Probe %s with %sraid and offset=%"PRIi64, devnode, noraid ? "no" : "", offset); + + r = probe_superblocks(pr); +- if (r < 0) ++ if (r < 0 && r != -2) //-2 if ambivalent result is detected + return log_device_debug_errno(dev, r, "Failed to probe superblocks: %m"); + + /* If the device is a partition then its parent passed the root partition UUID to the device */ +-- +2.27.0 + diff --git a/systemd.spec b/systemd.spec index d3e2fb5a75be55d7fe4a7308bee6fe44036c0ce4..d543c73d572ee3768b2559b80c0b0f5c407b0c10 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 249 -Release: 49 +Release: 50 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -509,6 +509,7 @@ Patch9053: support-disable-cgroup-controllers-we-don-t-want.patch Patch9054: fix-mount-failed-while-daemon-reexec.patch Patch9055: bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch Patch9056: delete-journal-files-except-system.journal-when-jour.patch +Patch9057: fix-udev-by-partuuid-devlink-missing-for-more-filesystems-on-the-device.patch BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel @@ -1921,6 +1922,13 @@ fi %{_libdir}/security/pam_systemd.so %changelog +* Mon Jun 5 2023 huangwenhua - 249-50 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix udev by-partuuid devlink missing for more filesystems on the device + [add] fix-udev-by-partuuid-devlink-missing-for-more-filesystems-on-the-device.patch + * Wed Mar 22 2023 hongjinghao - 249-49 - backport: sync patches from systemd community