]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fdisk: always print total number of sectors
authorPetr Uzel <petr.uzel@suse.cz>
Thu, 26 Jul 2012 14:04:26 +0000 (16:04 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 26 Jul 2012 15:18:55 +0000 (17:18 +0200)
Print it no regardless on units_per_sector.

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
fdisks/fdisk.c

index 3eddfa118eafe81ff9f7cb0ad642956e68fd031e..fb897d856713696a0ecb5a738e95c4e5b9a08b1a 100644 (file)
@@ -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),