mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
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
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user