From: Karel Zak <kzak@redhat.com>
Date: Mon, 23 Jul 2012 15:58:53 +0000 (+0200)
Subject: fdisk: set label pointer in fdisk_create_default_disklabel()
X-Git-Tag: v2.22-rc1~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed21ffd347ae67ea041747914229a8edcae6b46d;p=thirdparty%2Futil-linux.git

fdisk: set label pointer in fdisk_create_default_disklabel()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisks/utils.c b/fdisks/utils.c
index ffb0c25fbc..64abae6df0 100644
--- a/fdisks/utils.c
+++ b/fdisks/utils.c
@@ -303,9 +303,14 @@ int fdisk_create_default_disklabel(struct fdisk_context *cxt)
 {
 	if (!cxt)
 		return -EINVAL;
+
+	/* TODO: use fdisk_create_disklabel() */
 #ifdef __sparc__
+	cxt->label = &sun_label;
 	return create_sunlabel(cxt);
+
 #else
+	cxt->label = &dos_label;
 	return create_doslabel(cxt);
 #endif
 }