diff options
| author | Anand Avati <avati@redhat.com> | 2013-04-03 13:38:00 -0700 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-04-03 15:23:54 -0700 |
| commit | 125e0cc4eb7042f5b8549c0b77140528c0fc1151 (patch) | |
| tree | 83fd242567e39bbed09bb4e0458d856d29136392 | |
| parent | e80a04f7850144449a0d2fc4f9d40d0227f170cc (diff) | |
build: enable fusermount by default
The fusermount available in gluster is customized to ensure
mounting with SELinux happens properly, i.e - to have a separate
thread for fuse_thread_proc which can process getxattr requests
and in parallel perform sys_mount() in a different thread, thereby
avoiding a deadlock.
However our build and packaging defaults to not including our
fusermount. This patch reverses the defaults.
Change-Id: I793af4c2f56aeac46efae3db30e7c64ee7c18850
BUG: 811217
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.org/4773
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | glusterfs.spec.in | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 0c8cc38f..62512936 100644 --- a/configure.ac +++ b/configure.ac @@ -301,14 +301,15 @@ AC_SUBST(FUSE_CLIENT_SUBDIR) # FUSERMOUNT section AC_ARG_ENABLE([fusermount], - AC_HELP_STRING([--enable-fusermount], - [Build fusermount])) + AC_HELP_STRING([--disable-fusermount], + [Use system's fusermount])) -BUILD_FUSERMOUNT="no" -if test "x$enable_fusermount" = "xyes"; then - FUSERMOUNT_SUBDIR="contrib/fuse-util" - BUILD_FUSERMOUNT="yes" +BUILD_FUSERMOUNT="yes" +if test "x$disable_fusermount" = "xyes"; then + BUILD_FUSERMOUNT="no" +else AC_DEFINE(GF_FUSERMOUNT, 1, [Use our own fusermount]) + FUSERMOUNT_SUBDIR="contrib/fuse-util" fi AC_SUBST(FUSERMOUNT_SUBDIR) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index a522a006..fe3728c2 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -14,9 +14,9 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without epoll %{?_without_epoll:%global _without_epoll --disable-epoll} -# if you wish to compile an rpm with fusermount... -# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with fusermount -%{?_with_fusermount:%global _with_fusermount --enable-fusermount} +# if you wish to compile an rpm without fusermount... +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without fusermount +%{?_without_fusermount:%global _without_fusermount --disable-fusermount} # if you wish to compile an rpm without geo-replication support, compile like this... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication @@ -530,7 +530,7 @@ cd ../ufo %build ./autogen.sh -%configure %{?_without_rdma} %{?_without_epoll} %{?_with_fusermount} %{?_without_georeplication} %{?_without_ocf} +%configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication} %{?_without_ocf} # Remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -827,7 +827,7 @@ fi %if 0%{_for_fedora_koji_builds} /sbin/umount.glusterfs %endif -%if 0%{?_with_fusermount:1} +%if 0%{!?_without_fusermount:1} %{_bindir}/fusermount-glusterfs %endif |