summaryrefslogtreecommitdiffstats
path: root/shlibs/mount/src/mount.h.in
diff options
context:
space:
mode:
authorKarel Zak2011-01-13 10:43:33 +0100
committerKarel Zak2011-01-13 10:43:33 +0100
commit30e43998cf70e0891aff5b025a3c37f1c1581432 (patch)
treede4fb04a7142ba9a11d61f58a37d274631061d91 /shlibs/mount/src/mount.h.in
parentmount: fix reference to cifs-utils in mount.8 (diff)
downloadkernel-qcow2-util-linux-30e43998cf70e0891aff5b025a3c37f1c1581432.tar.gz
kernel-qcow2-util-linux-30e43998cf70e0891aff5b025a3c37f1c1581432.tar.xz
kernel-qcow2-util-linux-30e43998cf70e0891aff5b025a3c37f1c1581432.zip
libmount: improve fstab/mtab options usage
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src/mount.h.in')
-rw-r--r--shlibs/mount/src/mount.h.in18
1 files changed, 14 insertions, 4 deletions
diff --git a/shlibs/mount/src/mount.h.in b/shlibs/mount/src/mount.h.in
index 7710192a0..199549eb3 100644
--- a/shlibs/mount/src/mount.h.in
+++ b/shlibs/mount/src/mount.h.in
@@ -312,10 +312,20 @@ extern mnt_fs *mnt_update_get_fs(mnt_update *upd);
/* mode for mount options from fstab */
enum {
- MNT_OPTSMODE_AUTO = 0, /* use options if source or target are not defined */
- MNT_OPTSMODE_IGNORE, /* never use mount options from fstab */
- MNT_OPTSMODE_FORCE, /* always use mount options from fstab */
- MNT_OPTSMODE_MTABFORCE, /* for MS_REMOUNT use always options from mountinfo/mtab */
+ MNT_OMODE_IGNORE = (1 << 1), /* ignore mtab/fstab options */
+ MNT_OMODE_APPEND = (1 << 2), /* append mtab/fstab options to existing options */
+ MNT_OMODE_PREPEND = (1 << 3), /* prepend mtab/fstab options to existing options */
+ MNT_OMODE_REPLACE = (1 << 4), /* replace existing options with options from mtab/fstab */
+
+ MNT_OMODE_FORCE = (1 << 5), /* always read mtab/fstab options */
+
+ MNT_OMODE_FSTAB = (1 << 10), /* read from fstab */
+ MNT_OMODE_MTAB = (1 << 11), /* read from mtab if fstab not enabled or failed */
+
+ /* default */
+ MNT_OMODE_AUTO = (MNT_OMODE_PREPEND | MNT_OMODE_FSTAB | MNT_OMODE_MTAB),
+ /* non-root users */
+ MNT_OMODE_USER = (MNT_OMODE_REPLACE | MNT_OMODE_FORCE | MNT_OMODE_FSTAB)
};
extern mnt_context *mnt_new_context(void);