diff options
| author | Karel Zak | 2012-12-06 12:12:41 +0100 |
|---|---|---|
| committer | Karel Zak | 2013-03-11 11:20:41 +0100 |
| commit | aa42788d5f6beded3b36fb45cfaf4a27fff25698 (patch) | |
| tree | e453964dc3422dadcd65fce5fa84494b6f9abfed /fdisks/fdisk.c | |
| parent | libfdisk: add firstsector utils (diff) | |
| download | kernel-qcow2-util-linux-aa42788d5f6beded3b36fb45cfaf4a27fff25698.tar.gz kernel-qcow2-util-linux-aa42788d5f6beded3b36fb45cfaf4a27fff25698.tar.xz kernel-qcow2-util-linux-aa42788d5f6beded3b36fb45cfaf4a27fff25698.zip | |
libfdisk: add topology and geometry functions
- rename __discovery_* to fdisk_discovery_*
- rename fdisk_context_force_sector_size() to fdisk_override_sector_size()
- rename fdisk_context_set_user_geometry() to fdisk_override_geometry()
- remove non-default sector size warning
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.c')
| -rw-r--r-- | fdisks/fdisk.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index f34617f08..866d8fe21 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -1301,7 +1301,7 @@ expert_command_prompt(struct fdisk_context *cxt) case 'c': user_cylinders = read_int(cxt, 1, cxt->geom.cylinders, 1048576, 0, _("Number of cylinders")); - fdisk_context_set_user_geometry(cxt, user_cylinders, user_heads, user_sectors); + fdisk_override_geometry(cxt, user_cylinders, user_heads, user_sectors); if (fdisk_is_disklabel(cxt, SUN)) sun_set_ncyl(cxt, cxt->geom.cylinders); break; @@ -1327,7 +1327,7 @@ expert_command_prompt(struct fdisk_context *cxt) case 'h': user_heads = read_int(cxt, 1, cxt->geom.heads, 256, 0, _("Number of heads")); - fdisk_context_set_user_geometry(cxt, user_cylinders, user_heads, user_sectors); + fdisk_override_geometry(cxt, user_cylinders, user_heads, user_sectors); break; case 'i': if (fdisk_is_disklabel(cxt, SUN)) @@ -1356,7 +1356,7 @@ expert_command_prompt(struct fdisk_context *cxt) fprintf(stderr, _("Warning: setting " "sector offset for DOS " "compatibility\n")); - fdisk_context_set_user_geometry(cxt, user_cylinders, user_heads, user_sectors); + fdisk_override_geometry(cxt, user_cylinders, user_heads, user_sectors); break; case 'v': verify(cxt); @@ -1396,10 +1396,10 @@ static void print_partition_table_from_option(char *device, unsigned long sector err(EXIT_FAILURE, _("cannot open %s"), device); if (sector_size) /* passed -b option, override autodiscovery */ - fdisk_context_force_sector_size(cxt, sector_size); + fdisk_override_sector_size(cxt, sector_size); if (user_cylinders || user_heads || user_sectors) - fdisk_context_set_user_geometry(cxt, user_cylinders, + fdisk_override_geometry(cxt, user_cylinders, user_heads, user_sectors); if (!fdisk_dev_has_disklabel(cxt)) { @@ -1697,18 +1697,14 @@ int main(int argc, char **argv) err(EXIT_FAILURE, _("cannot open %s"), argv[optind]); if (sector_size) /* passed -b option, override autodiscovery */ - fdisk_context_force_sector_size(cxt, sector_size); + fdisk_override_sector_size(cxt, sector_size); if (user_cylinders || user_heads || user_sectors) - fdisk_context_set_user_geometry(cxt, user_cylinders, + fdisk_override_geometry(cxt, user_cylinders, user_heads, user_sectors); print_welcome(); - if (!fdisk_dev_sectsz_is_default(cxt)) - printf(_("Note: sector size is %ld (not %d)\n"), - cxt->sector_size, DEFAULT_SECTOR_SIZE); - if (!fdisk_dev_has_disklabel(cxt)) { update_units(cxt); /* to provide compatible 'p'rint output */ fprintf(stderr, |