mount: don't ignore mtab for --bind -o remount

Reported-by: Phillip Susi <psusi@ubuntu.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index f7084a963a394c3d0487012fe59f4cfcfc331851..14a5e5c798f1bcafb54e3dcc6f4570f77ad996cd 100644 (file)
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -697,6 +697,16 @@ static void append_option(struct libmnt_context *cxt, const char *opt)
                err(MOUNT_EX_SYSERR, _("failed to append option '%s'"), opt);
 }
 
+static int has_remount_flag(struct libmnt_context *cxt)
+{
+       unsigned long mflags = 0;
+
+       if (mnt_context_get_mflags(cxt, &mflags))
+               return 0;
+
+       return mflags & MS_REMOUNT;
+}
+
 static void __attribute__((__noreturn__)) usage(FILE *out)
 {
        fputs(USAGE_HEADER, out);
@@ -1090,8 +1100,8 @@ int main(int argc, char **argv)
                /* BIND/MOVE operations, let's set the mount flags */
                mnt_context_set_mflags(cxt, oper);
 
-       if (oper || propa)
-               /* For --make-* or --bind is fstab unnecessary */
+       if ((oper && !has_remount_flag(cxt)) || propa)
+               /* For --make-* or --bind is fstab/mtab unnecessary */
                mnt_context_set_optsmode(cxt, MNT_OMODE_NOTAB);
 
        rc = mnt_context_mount(cxt);