diff options
| author | Karel Zak | 2015-02-10 11:40:56 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-02-10 11:40:56 +0100 |
| commit | 0c6d9b63002db43a9eded4163ef1ff8e97ecd5b3 (patch) | |
| tree | 0eee079596d6f13f190c160381e7e60ef029cf35 /libmount/src/context.c | |
| parent | setarch: fix typo (missing braces) for ppcle (diff) | |
| download | kernel-qcow2-util-linux-0c6d9b63002db43a9eded4163ef1ff8e97ecd5b3.tar.gz kernel-qcow2-util-linux-0c6d9b63002db43a9eded4163ef1ff8e97ecd5b3.tar.xz kernel-qcow2-util-linux-0c6d9b63002db43a9eded4163ef1ff8e97ecd5b3.zip | |
Revert "libmount: MNT_OMODE_FORCE usage"
This reverts commit 6f41c5de40629c71a8f79e9be4b94f9a75f9ad21.
Diffstat (limited to 'libmount/src/context.c')
| -rw-r--r-- | libmount/src/context.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmount/src/context.c b/libmount/src/context.c index 1c288e550..c902f396e 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -2077,7 +2077,6 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt) } if (!src && tgt - && !(cxt->optsmode & MNT_OMODE_FORCE) && !(cxt->optsmode & MNT_OMODE_FSTAB) && !(cxt->optsmode & MNT_OMODE_MTAB)) { DBG(CXT, ul_debugobj(cxt, "only target; fstab/mtab not required " @@ -2089,7 +2088,7 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt) ignore_result( mnt_context_get_fs(cxt) ); /* try fstab */ - if (cxt->optsmode & (MNT_OMODE_FSTAB | MNT_OMODE_FORCE)) { + if (cxt->optsmode & MNT_OMODE_FSTAB) { DBG(CXT, ul_debugobj(cxt, "trying to apply fstab (src=%s, target=%s)", src, tgt)); rc = mnt_context_get_fstab(cxt, &tab); if (!rc) @@ -2097,7 +2096,7 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt) } /* try mtab */ - if (rc < 0 && (cxt->optsmode & (MNT_OMODE_MTAB | MNT_OMODE_FORCE))) { + if (rc < 0 && (cxt->optsmode & MNT_OMODE_MTAB)) { DBG(CXT, ul_debugobj(cxt, "trying to apply mtab (src=%s, target=%s)", src, tgt)); if (tgt) rc = mnt_context_get_mtab_for_target(cxt, &tab, tgt); |