From: Petr Uzel Date: Thu, 26 Jul 2012 14:04:26 +0000 (+0200) Subject: fdisk: always print total number of sectors X-Git-Tag: v2.22-rc1~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8527f4bd306ce4179d5f82027509770366e757b;p=thirdparty%2Futil-linux.git fdisk: always print total number of sectors Print it no regardless on units_per_sector. Signed-off-by: Petr Uzel --- diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index 3eddfa118e..fb897d8567 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -997,17 +997,16 @@ list_disk_geometry(struct fdisk_context *cxt) { long megabytes = bytes/1000000; if (megabytes < 10000) - printf(_("\nDisk %s: %ld MB, %lld bytes\n"), + printf(_("\nDisk %s: %ld MB, %lld bytes"), cxt->dev_path, megabytes, bytes); else { long hectomega = (megabytes + 50) / 100; - printf(_("\nDisk %s: %ld.%ld GB, %llu bytes\n"), + printf(_("\nDisk %s: %ld.%ld GB, %llu bytes"), cxt->dev_path, hectomega / 10, hectomega % 10, bytes); } + printf(_(", %llu sectors\n"), cxt->total_sectors); printf(_("%d heads, %llu sectors/track, %llu cylinders"), cxt->geom.heads, cxt->geom.sectors, cxt->geom.cylinders); - if (units_per_sector == 1) - printf(_(", total %llu sectors"), cxt->total_sectors); printf("\n"); printf(_("Units = %s of %d * %ld = %ld bytes\n"), str_units(PLURAL),