File util-linux-blockdev-report-dm.patch of Package util-linux-systemd.17283

Overview Repositories Revisions Requests Users Attributes Meta

File util-linux-blockdev-report-dm.patch of Package util-linux-systemd.17283

From 9147d2ad8abb73cea5799323fc73ccdaf675826f Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.cz>
Date: Fri, 5 Jun 2020 10:04:21 +0200
Subject: [PATCH] blockdev: Don't fail on missing start sector

It causes
 # blockdev --report" error:
 blockdev: /dev/dm-9: failed to read partition start from sysfs: No such file or directory

There is no reliable way to detect a geometry in this case. Report N/A
instead.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
Cc: Martin Wilck <martin.wilck@suse.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 disk-utils/blockdev.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index f1067c815..f425d1533 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -455,6 +455,7 @@ static void report_device(char *device, int quiet)
 	long ra;
 	unsigned long long bytes;
 	uint64_t start = 0;
+	char start_str[11] = { "\0" };
 	struct stat st;
 
 	fd = open(device, O_RDONLY | O_NONBLOCK);
@@ -476,19 +477,21 @@ static void report_device(char *device, int quiet)
 		    disk != st.st_rdev) {
 
 			if (ul_path_read_u64(pc, &start, "start") != 0)
-				err(EXIT_FAILURE,
-					_("%s: failed to read partition start from sysfs"),
-					device);
+				/* TRANSLATORS: Start sector not available. Max. 10 letters. */
+				sprintf(start_str, "%10s", _("N/A"));
 		}
 		ul_unref_path(pc);
 	}
+	if (!*start_str)
+		sprintf(start_str, "%10ju", start);
+
 	if (ioctl(fd, BLKROGET, &ro) == 0 &&
 	    ioctl(fd, BLKRAGET, &ra) == 0 &&
 	    ioctl(fd, BLKSSZGET, &ssz) == 0 &&
 	    ioctl(fd, BLKBSZGET, &bsz) == 0 &&
 	    blkdev_get_size(fd, &bytes) == 0) {
-		printf("%s %5ld %5d %5d %10ju %15lld   %s\n",
-		       ro ? "ro" : "rw", ra, ssz, bsz, start, bytes, device);
+		printf("%s %5ld %5d %5d %s %15lld   %s\n",
+			ro ? "ro" : "rw", ra, ssz, bsz, start_str, bytes, device);
 	} else {
 		if (!quiet)
 			warnx(_("ioctl error on %s"), device);
-- 
2.26.2

Places

File util-linux-blockdev-report-dm.patch of Package util-linux-systemd.17283

Places