ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Stanislav Brabec 2020-06-05 10:04:21 +02:00 committed by Karel Zak
parent 43d2ce3b44
commit 9147d2ad8a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
disk-utils/blockdev.c
View File

@ -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);