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..d94dfcb08bcc80aa4e78791263369d5e61e30bc1 --- /dev/null +++ b/fix-udev-by-partuuid-devlink-missing-for-more-filesystems-on-the-device.patch @@ -0,0 +1,50 @@ +From 43905834b5932322329f6e9661c7f4d7c12306c2 Mon Sep 17 00:00:00 2001 +From: huangwenhua +Date: Mon, 5 Jun 2023 11:27:39 +0800 +Subject: [PATCH] fix udev by-partuuid devlink missing for more + filesystems on the device + +--- + libblkid/src/probe.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c +index 5f01bc3..2dcfd7e 100644 +--- a/libblkid/src/probe.c ++++ b/libblkid/src/probe.c +@@ -1423,7 +1423,7 @@ int blkid_probe_step_back(blkid_probe pr) + */ + int blkid_do_safeprobe(blkid_probe pr) + { +- int i, count = 0, rc = 0; ++ int i, count = 0, rc = 0, ambivalent = 0; + + if (pr->flags & BLKID_FL_NOSCAN_DEV) + return 1; +@@ -1450,8 +1450,12 @@ int blkid_do_safeprobe(blkid_probe pr) + blkid_probe_chain_reset_position(chn); + + /* rc: -2 ambivalent, -1 = error, 0 = success, 1 = no result */ +- if (rc < 0) +- goto done; /* error */ ++ if (rc < 0) { ++ if (rc == -2) ++ ambivalent = -2; ++ else ++ goto done; /* error */ ++ } + if (rc == 0) + count++; /* success */ + } +@@ -1460,6 +1464,8 @@ done: + blkid_probe_end(pr); + if (rc < 0) + return rc; ++ if (ambivalent < 0) ++ return ambivalent; + return count ? 0 : 1; + } + +-- +2.27.0 + diff --git a/util-linux.spec b/util-linux.spec index d033fbb2aca92689f9abd2ab25fc1f058d4f7529..859d1b57cde71c5df9e13e8a6db01f1ca6de27c5 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.37.2 -Release: 17 +Release: 18 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -73,6 +73,7 @@ Patch6051: backport-mkswap-do-not-use-uninitialized-stack-value.patch Patch6052: backport-lib-pager-fix-signal-safety-issues.patch Patch6053: backport-libblkid-nvidia_raid-verify-superblock-size.patch Patch6054: backport-libblkid-nvidia_raid-validate-checksum.patch +Patch6055: fix-udev-by-partuuid-devlink-missing-for-more-filesystems-on-the-device.patch Patch9000: Add-check-to-resolve-uname26-version-test-failed.patch Patch9001: SKIPPED-no-root-permissions-test.patch @@ -443,6 +444,13 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Mon Jun 5 2023 huangwenhua - 2.37.2-18 +- Type:bugfix +- CVE: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 + * Thu Mar 16 2023 zhangyao - 2.37.2-17 - Type:bugfix - CVE:NA