summaryrefslogtreecommitdiffstats
path: root/fdisks/fdisk.c
diff options
context:
space:
mode:
authorKarel Zak2012-07-24 14:15:08 +0200
committerKarel Zak2012-07-24 14:15:08 +0200
commitde3d6c93790b1cb5016113f79f65b0439ade684c (patch)
tree0c71324737fa0745e49d07b5f4a2623d770bc8db /fdisks/fdisk.c
parentfdisk: de-duplicate disk label strings (diff)
downloadkernel-qcow2-util-linux-de3d6c93790b1cb5016113f79f65b0439ade684c.tar.gz
kernel-qcow2-util-linux-de3d6c93790b1cb5016113f79f65b0439ade684c.tar.xz
kernel-qcow2-util-linux-de3d6c93790b1cb5016113f79f65b0439ade684c.zip
Revert "fdisk: de-duplicate disk label strings"
... because it's not expected that fdisk_label will be exported by API and accessible for applications (like fdisk.c). It's private libfdisk stuff. This reverts commit e7818642600d6cd573a8e1ed5363fce52def5821.
Diffstat (limited to 'fdisks/fdisk.c')
-rw-r--r--fdisks/fdisk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 143263b94..244f0e7c4 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -1528,7 +1528,7 @@ expert_command_prompt(struct fdisk_context *cxt)
fix_partition_table_order();
break;
case 'g':
- fdisk_create_disklabel(cxt, sgi_label.name);
+ fdisk_create_disklabel(cxt, "sgi");
break;
case 'h':
user_heads = cxt->geom.heads = read_int(cxt, 1, cxt->geom.heads, 256, 0,
@@ -1754,7 +1754,7 @@ static void command_prompt(struct fdisk_context *cxt)
new_partition(cxt);
break;
case 'o':
- fdisk_create_disklabel(cxt, dos_label.name);
+ fdisk_create_disklabel(cxt, "dos");
break;
case 'p':
list_table(cxt, 0);
@@ -1762,7 +1762,7 @@ static void command_prompt(struct fdisk_context *cxt)
case 'q':
handle_quit(cxt);
case 's':
- fdisk_create_disklabel(cxt, sun_label.name);
+ fdisk_create_disklabel(cxt, "sun");
break;
case 't':
change_sysid(cxt);