From: Karel Zak <kzak@redhat.com>
Date: Wed, 16 Oct 2013 10:03:48 +0000 (+0200)
Subject: libfdisk: (bsd) leave context if new disklabel unwanted
X-Git-Tag: v2.24~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=243631e75e912b3a1ae323f24d970700732ea16c;p=thirdparty%2Futil-linux.git

libfdisk: (bsd) leave context if new disklabel unwanted

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

diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index ca55a13a9a..e898319fbb 100644
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -282,9 +282,10 @@ static int bsd_create_disklabel(struct fdisk_context *cxt)
 	rc = fdisk_ask_yesno(cxt,
 			_("Do you want to create a BSD disklabel?"),
 			&yes);
-
-	if (rc || !yes)
+	if (rc)
 		return rc;
+	if (!yes)
+		return 1;
 	if (cxt->parent) {
 		rc = bsd_assign_dos_partition(cxt);
 		if (rc == 1)