From: Petr Uzel <petr.uzel@suse.cz>
Date: Sun, 13 May 2012 11:44:32 +0000 (+0200)
Subject: mkswap: improve diagnostics message if the device is mounted
X-Git-Tag: v2.22-rc1~417
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dceb1f220c9210a5dfa6565157b223c54f677be2;p=thirdparty%2Futil-linux.git

mkswap: improve diagnostics message if the device is mounted

Currently, attempt to create swap on mounted partition results
with "/dev/sdXy: Device or resource busy" message being printed.
Change this to explicitly telling the user that the device is mounted.

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index dec34e1ae3..43129a7d16 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -582,6 +582,11 @@ main(int argc, char **argv) {
 			PAGES * pagesize / 1024);
 	}
 
+	if (is_mounted(device_name))
+		errx(EXIT_FAILURE, _("error: "
+			"%s is mounted; will not make swapspace."),
+			device_name);
+
 	if (stat(device_name, &statbuf) < 0) {
 		perror(device_name);
 		exit(EXIT_FAILURE);
@@ -598,10 +603,6 @@ main(int argc, char **argv) {
 
 	if (!S_ISBLK(statbuf.st_mode))
 		check=0;
-	else if (is_mounted(device_name))
-		errx(EXIT_FAILURE, _("error: "
-			"%s is mounted; will not make swapspace."),
-			device_name);
 	else if (blkdev_is_misaligned(DEV))
 		warnx(_("warning: %s is misaligned"), device_name);