From: Karel Zak <kzak@redhat.com>
Date: Wed, 31 Aug 2016 09:01:03 +0000 (+0200)
Subject: Revert "sfdisk: exit with error if rereading partition table fails"
X-Git-Tag: v2.28.2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8772f72e3a23529cf61ebb2468393d8f28d4ef62;p=thirdparty%2Futil-linux.git

Revert "sfdisk: exit with error if rereading partition table fails"

This reverts commit e0d30ef4c0a8baf5ad52f4ebce2ceef1944d711b. It was
mistake to applied this commit to the stable branch. It's already
reverted in master branch too (see
78e7f78896f2c9cf1b2615c8c555a64dcd9d2642 for more details).

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

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index f7afd9f44a..3f742d2703 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -534,7 +534,7 @@ static int write_changes(struct sfdisk *sf)
 			rc = move_partition_data(sf, sf->partno, sf->orig_pa);
 		if (!rc) {
 			fdisk_info(sf->cxt, _("\nThe partition table has been altered."));
-			rc = fdisk_reread_partition_table(sf->cxt);
+			fdisk_reread_partition_table(sf->cxt);
 		}
 	}
 	if (!rc)