From: Phillip Susi <psusi@cfl.rr.com>
Date: Mon, 5 Dec 2011 20:02:51 +0000 (-0500)
Subject: partx: don't print error when partition already doesn't exist
X-Git-Tag: v2.21-rc1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab025087f91b66ee8e23a16bc49eb0d9bd421d65;p=thirdparty%2Futil-linux.git

partx: don't print error when partition already doesn't exist

If you run partx -d to delete partitions, and there are gaps
in the sequence ( partition 2 exists, but 1 doesn't ), then it
would complain that it had errors trying to remove the partitions
that already don't exist. Changed to ignore the error when
errno == ENXIO.

Signed-off-by: Phillip Susi <psusi@cfl.rr.com>
---

diff --git a/partx/partx.c b/partx/partx.c
index d2fde3f4e6..7c4235bb0e 100644
--- a/partx/partx.c
+++ b/partx/partx.c
@@ -302,10 +302,15 @@ static int del_parts(int fd, const char *device, dev_t devno,
 	}
 
 	for (i = lower; i <= upper; i++) {
-		if (partx_del_partition(fd, i) == 0) {
+		rc = partx_del_partition(fd, i);
+		if (rc == 0) {
 			if (verbose)
 				printf(_("%s: partition #%d removed\n"), device, i);
 			continue;
+		} else if (errno == ENXIO) {
+			if (verbose)
+				printf(_("%s: partition #%d already doesn't exist\n"), device, i);
+			continue;
 		}
 		rc = -1;
 		if (verbose)