summaryrefslogtreecommitdiff
path: root/src/mount
diff options
context:
space:
mode:
authorFelipe Sateler <fsateler@gmail.com>2017-09-07 16:16:19 -0300
committerFelipe Sateler <fsateler@gmail.com>2017-09-07 16:16:47 -0300
commit02a8bd656c06cd8f554f4aa7e67f0d4f692eda41 (patch)
tree7fea388fabb17d2f92ae2e8b06956353052feb25 /src/mount
parent1ed555b712be6df19dbcf6e744489e3ca3476c77 (diff)
downloadsystemd-02a8bd656c06cd8f554f4aa7e67f0d4f692eda41.tar.gz
mount: always show the user-provided argument when umount can't be done
Otherwise it can be confusing if the path is not the same
Diffstat (limited to 'src/mount')
-rw-r--r--src/mount/mount-tool.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 2e282ef04e..64438cd6d7 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -998,7 +998,7 @@ static int action_umount(
r = path_make_absolute_cwd(u, &a);
if (r < 0) {
- r2 = log_error_errno(r, "Failed to make path absolute: %m");
+ r2 = log_error_errno(r, "Failed to make path %s absolute: %m", argv[i]);
continue;
}
@@ -1010,7 +1010,7 @@ static int action_umount(
}
if (stat(p, &st) < 0)
- return log_error_errno(errno, "Can't stat %s: %m", p);
+ return log_error_errno(errno, "Can't stat %s (from %s): %m", p, argv[i]);
if (S_ISBLK(st.st_mode))
r = umount_by_device(bus, p);
@@ -1019,7 +1019,7 @@ static int action_umount(
else if (S_ISDIR(st.st_mode))
r = stop_mounts(bus, p);
else {
- log_error("Invalid file type: %s", p);
+ log_error("Invalid file type: %s (from %s)", p, argv[i]);
r = -EINVAL;
}