diff options
author | Niels de Vos <ndevos@redhat.com> | 2013-05-22 16:20:36 +0200 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2013-05-29 11:26:40 -0700 |
commit | 06036dd18d67bf55111a46915f702078fdf8e65b (patch) | |
tree | e93b4ca4ae91477ee04bde1b6a24c5f73332d620 | |
parent | 0a4c0eac0aeeec88cb9bfeb08c2eac8b98be4622 (diff) |
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 <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/5102
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r-- | extras/init.d/Makefile.am | 2 | ||||
-rwxr-xr-x | extras/init.d/rhel5-load-fuse.modules | 7 | ||||
-rw-r--r-- | glusterfs.spec.in | 8 |
3 files changed, 16 insertions, 1 deletions
diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am index 66715f4314a..7c26a0e8e2b 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 00000000000..ee194db99b8 --- /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 b7576d53643..c54dcb50da2 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,-) |