aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2020-12-02 19:10:22 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2020-12-02 19:10:22 +0100
commitb4f93f562d261a163113cd15cc252c53d2fa27bb (patch)
tree9c6fab857db88148b1d906c4af37ddc658582f7d
parent665a65953076ea21be49250b8279ddb1f0f99f38 (diff)
downloadbusybox-b4f93f562d261a163113cd15cc252c53d2fa27bb.tar.gz
mount: do not guess bind mounts as nfs
Fails as follows: $ mount -o bind /dev/disk/by-path/pci-0000:13:00.0-scsi-0:0:3:0 /dir mount: bad address '/dev/disk/by-path/pci-0000' function old new delta singlemount 1256 1273 +17 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/mount.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index cfb6b570f..dba583544 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -2066,6 +2066,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
// Might this be an NFS filesystem?
if ((!mp->mnt_type || is_prefixed_with(mp->mnt_type, "nfs"))
&& strchr(mp->mnt_fsname, ':') != NULL
+ && !(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))
) {
if (!mp->mnt_type)
mp->mnt_type = (char*)"nfs";