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

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

Reported-by: Phillip Susi <psusi@ubuntu.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-10-17 08:52:00 +02:00
parent 7190b9b2ce
commit ba986e815c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys-utils/mount.c
View File

@ -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);