diff options
| author | Brian Behlendorf <[email protected]> | 2011-03-04 15:14:46 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-03-09 15:26:48 -0800 |
| commit | d53368f6755ff67342f68e2e536c4157409fd047 (patch) | |
| tree | be909c931e465df4757a67f9329ab9e2b1dc6941 /lib/libspl | |
| parent | adf2e8778e66e6a749cec981da00463b342bd563 (diff) | |
Fix mount helper
Several issues related to strange mount/umount behavior were reported
and this commit should address most of them. The original idea was
to put in place a zfs mount helper (mount.zfs). This helper is used
to enforce 'legacy' mount behavior, and perform any extra mount argument
processing (selinux, zfsutil, etc). This helper wasn't ready for the
0.6.0-rc1 release but with this change it's functional but needs to
extensively tested.
This change addresses the following open issues.
Closes #101
Closes #107
Closes #113
Closes #115
Closes #119
Diffstat (limited to 'lib/libspl')
| -rw-r--r-- | lib/libspl/include/sys/mntent.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/libspl/include/sys/mntent.h b/lib/libspl/include/sys/mntent.h index d552c9c17..1cbdc3aeb 100644 --- a/lib/libspl/include/sys/mntent.h +++ b/lib/libspl/include/sys/mntent.h @@ -31,9 +31,6 @@ #define MNTTYPE_ZFS "zfs" /* ZFS file system */ -#define FSTAB "/etc/fstab" -#define MNTMAXSTR 128 - #define MOUNT_SUCCESS 0x00 /* Success */ #define MOUNT_USAGE 0x01 /* Invalid invocation or permissions */ #define MOUNT_SYSERR 0x02 /* System error (ENOMEM, etc) */ @@ -49,6 +46,7 @@ #define MNTOPT_AUTO "auto" /* automount */ #define MNTOPT_NOAUTO "noauto" /* do not automount */ #define MNTOPT_CONTEXT "context" /* selinux context */ +#define MNTOPT_NOCONTEXT "nocontext" /* No selinux context (zfs-only) */ #define MNTOPT_FSCONTEXT "fscontext" /* selinux fscontext */ #define MNTOPT_DEFCONTEXT "defcontext" /* selinux defcontext */ #define MNTOPT_ROOTCONTEXT "rootcontext" /* selinux rootcontext */ @@ -93,10 +91,10 @@ #define MNTOPT_XATTR "user_xattr" /* enable extended attributes */ #define MNTOPT_NOXATTR "nouser_xattr" /* disable extended attributes */ #define MNTOPT_COMMENT "comment" /* comment */ -#define MNTOPT_BOOTWAIT "bootwait" -#define MNTOPT_NOBOOTWAIT "nobootwait" -#define MNTOPT_OPTIONAL "optional" -#define MNTOPT_SHOWTHROUGH "showthrough" #define MNTOPT_ZFSUTIL "zfsutil" /* called by zfs utility */ +#define ZS_COMMENT 0x00000000 /* comment */ +#define ZS_ZFSUTIL 0x00000001 /* caller is zfs(8) */ +#define ZS_NOCONTEXT 0x00000002 /* do not add selinux context */ + #endif /* _SYS_MNTENT_H */ |