summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2014-01-28 10:59:57 +0100
committerVijay Bellur <vbellur@redhat.com>2014-03-10 00:32:04 -0700
commit91b02583db1f16b96e005180eee9ffcd0345b7bc (patch)
treed708ef5dd615068abf78566fd23bfdfdf16ba676
parent41deb1ec8f7d1091de702947876444dd713fab7f (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. Backport from: > 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> Change-Id: If5fb368b6737fe8b6f22d2f2aa0785baa7f96364 BUG: 1058666 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/6831 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Justin Clift <justin@gluster.org> Tested-by: Justin Clift <justin@gluster.org> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--configure.ac13
-rw-r--r--glusterfs.spec.in10
2 files changed, 12 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 0b64774..1bf2a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,14 +258,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 c5ab0fc..75a05d9 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -18,9 +18,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}
%global version @PACKAGE_VERSION@
%if "%{version}" >= "3.2"
@@ -179,7 +179,7 @@ This package provides the development libraries.
%build
./autogen.sh
-%configure %{?_without_rdma} %{?_without_epoll} %{?_with_fusermount} %{?_without_georeplication}
+%configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication}
# Remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -317,7 +317,7 @@ fi
%{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
#%{_mandir}/man8/mount.glusterfs.8*
/sbin/mount.glusterfs
-%if 0%{?_with_fusermount:1}
+%if 0%{!?_without_fusermount:1}
%{_bindir}/fusermount-glusterfs
%endif