ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mount: (new) improve error messages 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-04-17 11:36:36 +02:00
parent e01c731992
commit 58f108ef2b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys-utils/mount.c
View File

@ -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"),