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/libzfs/libzfs_mount.c | |
| 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/libzfs/libzfs_mount.c')
| -rw-r--r-- | lib/libzfs/libzfs_mount.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c index f8f12d1bf..a1faf49d1 100644 --- a/lib/libzfs/libzfs_mount.c +++ b/lib/libzfs/libzfs_mount.c @@ -72,9 +72,6 @@ #include <sys/mntent.h> #include <sys/mount.h> #include <sys/stat.h> -#ifdef HAVE_LIBSELINUX -#include <selinux/selinux.h> -#endif /* HAVE_LIBSELINUX */ #include <libzfs.h> @@ -346,12 +343,6 @@ zfs_mount(zfs_handle_t *zhp, const char *options, int flags) */ strlcat(mntopts, "," MNTOPT_ZFSUTIL, sizeof (mntopts)); -#ifdef HAVE_LIBSELINUX - if (is_selinux_enabled()) - (void) strlcat(mntopts, ",context=\"system_u:" - "object_r:file_t:s0\"", sizeof (mntopts)); -#endif /* HAVE_LIBSELINUX */ - if (!zfs_is_mountable(zhp, mountpoint, sizeof (mountpoint), NULL)) return (0); |