From b66da7ce4a04d6c960817a56fe82498c4e7dea44 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 28 Aug 2023 13:21:33 +0200 Subject: [PATCH] losetup: fix JSON MAJ:MIN Fixes: https://github.com/util-linux/util-linux/issues/2460 Signed-off-by: Karel Zak --- sys-utils/losetup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c index 75071360d6..1705379ba1 100644 --- a/sys-utils/losetup.c +++ b/sys-utils/losetup.c @@ -253,7 +253,8 @@ static int set_scols_data(struct loopdev_cxt *lc, struct libscols_line *ln) { dev_t dev = 0; if (loopcxt_get_backing_devno(lc, &dev) == 0 && dev) - xasprintf(&np, "%8u:%-3u", major(dev), minor(dev)); + xasprintf(&np, raw || json ? "%u:%u" : "%8u:%-3u", + major(dev), minor(dev)); break; } case COL_MAJMIN: @@ -264,8 +265,8 @@ static int set_scols_data(struct loopdev_cxt *lc, struct libscols_line *ln) && stat(loopcxt_get_device(lc), &st) == 0 && S_ISBLK(st.st_mode) && major(st.st_rdev) == LOOPDEV_MAJOR) - xasprintf(&np, "%3u:%-3u", major(st.st_rdev), - minor(st.st_rdev)); + xasprintf(&np, raw || json ? "%u:%u" :"%3u:%-3u", + major(st.st_rdev), minor(st.st_rdev)); break; } case COL_BACK_INO: -- 2.47.2