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@xxxxxxx>
---
disk-utils/mkswap.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index dec34e1..43129a7 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);
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
