]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fdisk: fix -N internal return code
authorKarel Zak <kzak@redhat.com>
Mon, 2 Nov 2015 09:12:00 +0000 (10:12 +0100)
committerKarel Zak <kzak@redhat.com>
Mon, 2 Nov 2015 09:12:00 +0000 (10:12 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
disk-utils/sfdisk.c

index c2ef44d892bd5d308cd7b3288c8401784e0738e5..532974e5dce58439b30e8216bbeb8fe878d8f6bd 100644 (file)
@@ -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);