diff options
| author | Karel Zak | 2015-01-16 12:24:57 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-01-16 12:24:57 +0100 |
| commit | 2498303575b85fe0a81dabb3775eb0a60a5f420a (patch) | |
| tree | 0b09e0c58d9736777113e07edc446fb26a150715 /libmount/src/context.c | |
| parent | libblkid: (bcache) fix keys usage (diff) | |
| download | kernel-qcow2-util-linux-2498303575b85fe0a81dabb3775eb0a60a5f420a.tar.gz kernel-qcow2-util-linux-2498303575b85fe0a81dabb3775eb0a60a5f420a.tar.xz kernel-qcow2-util-linux-2498303575b85fe0a81dabb3775eb0a60a5f420a.zip | |
libmount: revert "read mtab on remount" idea
It's backwardly incompatible nonsense to prefer mtab on remount.
mount -o remount /foo
has to read mount options from fstab otherwise the remount has no
effect. (The ideal solution would be to read both mtab, then modify
the options according to fstab -- but for now more important is to be
backwardly compatible.)
References: https://bugzilla.redhat.com/show_bug.cgi?id=1182778
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src/context.c')
| -rw-r--r-- | libmount/src/context.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libmount/src/context.c b/libmount/src/context.c index 14fa44b52..f623f34a7 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -2051,13 +2051,8 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt) cxt->optsmode &= ~MNT_OMODE_FORCE; } - if (mnt_context_get_mflags(cxt, &mflags) == 0 && mflags & MS_REMOUNT) { - /* preffer mtab on remount */ - DBG(CXT, ul_debugobj(cxt, "force mtab parsing on remount")); - cxt->optsmode |= MNT_OMODE_MTAB; - cxt->optsmode &= ~MNT_OMODE_FSTAB; + if (mnt_context_get_mflags(cxt, &mflags) == 0 && mflags & MS_REMOUNT) isremount = 1; - } if (cxt->fs) { src = mnt_fs_get_source(cxt->fs); |