From d0e127de79dbeca07b2af67eb63a65444693bc1d Mon Sep 17 00:00:00 2001 From: cenhuilin Date: Tue, 2 Sep 2025 15:25:54 +0800 Subject: [PATCH] lsblk: use md as fallback TYPE when md/level empty (cherry picked from commit 04accaaacb382a105ac13235bf5fb285f1c441ad) --- ...as-fallback-TYPE-when-md-level-empty.patch | 25 +++++++++++++++++++ util-linux.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch diff --git a/backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch b/backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch new file mode 100644 index 0000000..abef6ac --- /dev/null +++ b/backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch @@ -0,0 +1,25 @@ +From 6bed45b965b22c8ea5c10c43320c19cf84fd8cfa Mon Sep 17 00:00:00 2001 +From: codefiles <11915375+codefiles@users.noreply.github.com> +Date: Tue, 2 Sep 2025 15:21:06 +0800 +Subject: [PATCH] lsblk: use md as fallback TYPE when md/level empty + +--- + misc-utils/lsblk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c +index fae918b..0df7962 100644 +--- a/misc-utils/lsblk.c ++++ b/misc-utils/lsblk.c +@@ -452,7 +452,7 @@ static char *get_type(struct lsblk_device *dev) + char *md_level = NULL; + + ul_path_read_string(dev->sysfs, &md_level, "md/level"); +- res = md_level ? md_level : xstrdup("md"); ++ res = (md_level && *md_level) ? md_level : xstrdup("md"); + + } else { + const char *type = NULL; +-- +2.43.0 + diff --git a/util-linux.spec b/util-linux.spec index 71a17e0..4db53b2 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 26 +Release: 27 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 @@ -117,6 +117,7 @@ Patch6095: backport-Revert-libblkid-try-LUKS2-first-when-probing.patch Patch6096: backport-libblkid-topology-ioctl-correctly-handle-kernel-type.patch Patch6097: backport-libmount-fix-umount-read-only.patch Patch6098: backport-libsmartcols-fix-reduction-stages-use.patch +Patch6099: backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch Patch9000: SKIPPED-no-root-permissions-test.patch Patch9001: util-linux-Add-sw64-architecture.patch @@ -482,6 +483,12 @@ fi %endif %changelog +* Tue Sep 02 2025 cenhuilin - 2.39.1-27 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:lsblk: use md as fallback TYPE when md/level empty + * Mon Aug 18 2025 Linux_zhang - 2.39.1-26 - backport community patches -- Gitee