From: Karel Zak <kzak@redhat.com>
Date: Tue, 24 Jul 2012 12:15:08 +0000 (+0200)
Subject: Revert "fdisk: de-duplicate disk label strings"
X-Git-Tag: v2.22-rc1~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de3d6c93790b1cb5016113f79f65b0439ade684c;p=thirdparty%2Futil-linux.git

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.
---

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 143263b940..244f0e7c48 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);