From: Karel Zak <kzak@redhat.com>
Date: Mon, 20 May 2013 11:10:52 +0000 (+0200)
Subject: sfdisk: don't call BLKRRPART for non-block devices
X-Git-Tag: v2.24-rc1~546
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4df7954d47e08aabae993e7fe0193f08c83b2ff0;p=thirdparty%2Futil-linux.git

sfdisk: don't call BLKRRPART for non-block devices

Reported-by: Bertrand Jacquin <beber@meleeweb.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisks/sfdisk.c b/fdisks/sfdisk.c
index 27f62d8162..e639dadebe 100644
--- a/fdisks/sfdisk.c
+++ b/fdisks/sfdisk.c
@@ -787,15 +787,17 @@ reread_ioctl(int fd) {
 /* reread after writing */
 static int
 reread_disk_partition(char *dev, int fd) {
-    printf(_("Re-reading the partition table ...\n"));
     fflush(stdout);
     sync();
 
-    if (reread_ioctl(fd) && is_blkdev(fd)) {
-	warnx(_("The command to re-read the partition table failed.\n"
+    if (is_blkdev(fd)) {
+	printf(_("Re-reading the partition table ...\n"));
+	if (reread_ioctl(fd) ) {
+	   warnx(_("The command to re-read the partition table failed.\n"
 		"Run partprobe(8), kpartx(8) or reboot your system now,\n"
 		"before using mkfs\n"));
-	return 0;
+	   return 0;
+	}
     }
 
     if (close_fd(fd) != 0) {