summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorKarel Zak2014-08-20 11:43:02 +0200
committerKarel Zak2014-08-20 11:43:02 +0200
commit6b11aad26b29d4984965ff1044184117c0955843 (patch)
tree1a577084410f1a7b9df888fa32dd269861125f90 /disk-utils
parenttests: fix fdisk/bsd for the two possible sectors/offsets (diff)
downloadkernel-qcow2-util-linux-6b11aad26b29d4984965ff1044184117c0955843.tar.gz
kernel-qcow2-util-linux-6b11aad26b29d4984965ff1044184117c0955843.tar.xz
kernel-qcow2-util-linux-6b11aad26b29d4984965ff1044184117c0955843.zip
libfdisk: fix fdisk_get_optimal_iosize() and update tests
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/fdisk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index b3d1ac311..cd70dc99b 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -528,7 +528,7 @@ void list_disk_geometry(struct fdisk_context *cxt)
bytes, (uintmax_t) fdisk_get_nsectors(cxt));
free(strsz);
- if (fdisk_label_require_geometry(lb) || fdisk_use_cylinders(cxt))
+ if (lb && (fdisk_label_require_geometry(lb) || fdisk_use_cylinders(cxt)))
fdisk_info(cxt, _("Geometry: %d heads, %llu sectors/track, %llu cylinders"),
fdisk_get_geom_heads(cxt),
fdisk_get_geom_sectors(cxt),