From 58f108ef2b9c8cc0362e7781a72e5e921dc383b3 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 17 Apr 2012 11:36:36 +0200 Subject: [PATCH] mount: (new) improve error messages Signed-off-by: Karel Zak --- sys-utils/mount.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys-utils/mount.c b/sys-utils/mount.c index 0f6140690..d1e2e16c7 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -349,16 +349,13 @@ try_readonly: return MOUNT_EX_USAGE; } - /* - * TODO: add mnt_context_fstab_applied() to check if we found - * target/source in the file. - */ - if (!tgt) { - if (mflags & MS_REMOUNT) - warnx(_("%s not mounted"), src ? src : tgt); - else + if (!tgt || (!src && !(mflags & MS_PROPAGATION))) { + if (!mnt_context_fstab_applied(cxt)) warnx(_("can't find %s in %s"), src ? src : tgt, mnt_get_fstab_path()); + else if (mflags & MS_REMOUNT) + warnx(_("%s not mounted"), src ? src : tgt); + return MOUNT_EX_USAGE; } @@ -467,6 +464,8 @@ try_readonly: case EINVAL: if (mflags & MS_REMOUNT) warnx(_("%s not mounted or bad option"), tgt); + else if (mflags & MS_PROPAGATION) + warnx(_("%s is not mountpoint or bad option"), tgt); else warnx(_("wrong fs type, bad option, bad superblock on %s,\n" " missing codepage or helper program, or other error"),