From 06036dd18d67bf55111a46915f702078fdf8e65b Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 22 May 2013 16:20:36 +0200 Subject: rpm: automatically load the fuse module on EL5 The fuse module needs to be loaded before /dev/fuse can be used. On RHEL6 and Fedora the module is loaded on demand. RHEL5 needs to load the module manually. This change add a script under /etc/sysconfig/modules/ that loads the fuse module on boot and packages it in the EL5 version of glusterfs-fuse. One of the features of GlusterFS is to not depend on additional fuse userspace. The conditional requires on /usr/bin/fusermount is not needed, this command is never called in the current version (even though is it referenced in the sources). BUG: 947830 Change-Id: I166327b8f2dff2c150368bdf5ea917af259186b2 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/5102 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Vijay Bellur --- extras/init.d/Makefile.am | 2 +- extras/init.d/rhel5-load-fuse.modules | 7 +++++++ glusterfs.spec.in | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 extras/init.d/rhel5-load-fuse.modules diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am index 66715f431..7c26a0e8e 100644 --- a/extras/init.d/Makefile.am +++ b/extras/init.d/Makefile.am @@ -1,5 +1,5 @@ -EXTRA_DIST = glusterd-Debian glusterd-Redhat glusterd-SuSE glusterd.plist +EXTRA_DIST = glusterd-Debian glusterd-Redhat glusterd-SuSE glusterd.plist rhel5-load-fuse.modules CLEANFILES = diff --git a/extras/init.d/rhel5-load-fuse.modules b/extras/init.d/rhel5-load-fuse.modules new file mode 100755 index 000000000..ee194db99 --- /dev/null +++ b/extras/init.d/rhel5-load-fuse.modules @@ -0,0 +1,7 @@ +#!/bin/sh +# +# fusermount-glusterfs requires the /dev/fuse character device. The fuse module +# provides this and is loaded on demand in newer Linux distributions. +# + +[ -c /dev/fuse ] || /sbin/modprobe fuse diff --git a/glusterfs.spec.in b/glusterfs.spec.in index b7576d536..c54dcb50d 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -605,6 +605,11 @@ cd .. %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/glusterd %endif +%if 0%{?rhel} && 0%{?rhel} <= 5 +%{__install} -D -p -m 0755 extras/init.d/rhel5-load-fuse.modules \ + %{buildroot}%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules +%endif + %{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterd %{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfs %{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfsd @@ -855,6 +860,9 @@ fi %if 0%{?_with_fusermount:1} %{_bindir}/fusermount-glusterfs %endif +%if 0%{?rhel} && 0%{?rhel} <= 5 +%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules +%endif %files server %defattr(-,root,root,-) -- cgit