summaryrefslogtreecommitdiff
path: root/fdisk/fdisksgilabel.c
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2006-12-07 00:26:28 +0100
committerKarel Zak <kzak@redhat.com>2006-12-07 00:26:28 +0100
commit5213517f54c70a784c06ee85c066aa2b4f375c4b (patch)
treebd0b55ed9621bf27f70fc2e338a9816496246beb /fdisk/fdisksgilabel.c
parentb22550fa1506e7cf4101bacc694842678908aaf2 (diff)
downloadutil-linux-old-5213517f54c70a784c06ee85c066aa2b4f375c4b.tar.gz
Imported from util-linux-2.12l tarball.
Diffstat (limited to 'fdisk/fdisksgilabel.c')
-rw-r--r--fdisk/fdisksgilabel.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 663e925a..b46515e2 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -201,19 +201,21 @@ sgi_list_table(int xtra) {
"%d cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"%s\n"
- "Units = %s of %d * 512 bytes\n\n"),
+ "Units = %s of %d * %d bytes\n\n"),
disk_device, heads, sectors, cylinders,
SSWAP16(sgiparam.pcylcount),
SSWAP16(sgiparam.sparecyl),
SSWAP16(sgiparam.ilfact),
(char *)sgilabel,
- str_units(PLURAL), units_per_sector);
+ str_units(PLURAL), units_per_sector,
+ sector_size);
} else {
printf(_("\nDisk %s (SGI disk label): "
"%d heads, %d sectors, %d cylinders\n"
- "Units = %s of %d * 512 bytes\n\n"),
+ "Units = %s of %d * %d bytes\n\n"),
disk_device, heads, sectors, cylinders,
- str_units(PLURAL), units_per_sector);
+ str_units(PLURAL), units_per_sector,
+ sector_size);
}
printf(_("----- partitions -----\n"
"Pt# %*s Info Start End Sectors Id System\n"),
@@ -766,7 +768,7 @@ create_sgilabel(void)
sgilabel->devparam.unused1 = SSWAP16(0);
sgilabel->devparam.nsect = SSWAP16(geometry.sectors);
/* sectors/track */
- sgilabel->devparam.bytes = SSWAP16(512);
+ sgilabel->devparam.bytes = SSWAP16(sector_size);
sgilabel->devparam.ilfact = SSWAP16(1);
sgilabel->devparam.flags = SSWAP32(TRACK_FWD|\
IGNORE_ERRORS|RESEEK);