From: Karel Zak <kzak@redhat.com>
Date: Mon, 2 Nov 2015 09:12:00 +0000 (+0100)
Subject: fdisk: fix -N internal return code
X-Git-Tag: v2.27.1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0bcd372a4c04d540c8363ec2c4579fb450849ca;p=thirdparty%2Futil-linux.git

fdisk: fix -N internal return code

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

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index c2ef44d892..532974e5dc 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1362,8 +1362,7 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
 			}
 			if (!rc && partno >= 0) {	/* -N <partno>, modify partition */
 				rc = fdisk_set_partition(sf->cxt, partno, pa);
-				if (rc == 0)
-					rc = SFDISK_DONE_ASK;
+				rc = rc == 0 ? SFDISK_DONE_ASK : SFDISK_DONE_ABORT;
 				break;
 			} else if (!rc) {		/* add partition */
 				rc = fdisk_add_partition(sf->cxt, pa, &cur_partno);