summaryrefslogtreecommitdiffstats
path: root/sys-utils/mount.c
diff options
context:
space:
mode:
authorKarel Zak2013-02-13 12:36:10 +0100
committerKarel Zak2013-02-13 12:36:10 +0100
commit82a2c1600ddc50b6c0bf0f521035b9b82a6e0a8e (patch)
tree26385585e61af105caa694a830b9fa55f254f649 /sys-utils/mount.c
parentchfn: Add libuser support (diff)
downloadkernel-qcow2-util-linux-82a2c1600ddc50b6c0bf0f521035b9b82a6e0a8e.tar.gz
kernel-qcow2-util-linux-82a2c1600ddc50b6c0bf0f521035b9b82a6e0a8e.tar.xz
kernel-qcow2-util-linux-82a2c1600ddc50b6c0bf0f521035b9b82a6e0a8e.zip
libmount: correctly propagate ambivalent blkid probing results
libmount ignores "ambivalent probing result" from libblkid and tries filesystems /etc/filesystems. This is incorrect behavior. Reported-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/mount.c')
-rw-r--r--sys-utils/mount.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 0c74ed900..ebdfe885d 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -385,6 +385,11 @@ try_readonly:
warnx(_("can't find mount source %s in %s"),
src, mnt_get_fstab_path());
return MOUNT_EX_USAGE;
+ case -MNT_ERR_AMBIFS:
+ warnx(_("%s: more filesystems detected. This should not happen,\n"
+ " use -t <type> to explicitly specify the filesystem type or\n"
+ " use wipefs(8) to clean up the device."), src);
+ return MOUNT_EX_USAGE;
case -MNT_ERR_NOFSTYPE:
if (restricted)
warnx(_("I could not determine the filesystem type, "