diff options
| author | Niels de Vos <ndevos@redhat.com> | 2014-01-15 14:22:44 +0100 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-01-21 06:48:35 -0800 |
| commit | fdc82748a1d1f063e3c11c840e6ec54ddf0fe0e1 (patch) | |
| tree | d60c2ea520693cc3e791dcfa6f08588bd3404014 | |
| parent | 17c4fb2d04f84b5632983866e8bddfbd7d77a054 (diff) | |
build: Install /var/lib/glusterd/groups/virt by default
/var/lib/glusterd/groups/virt is not installed by default, but that
should be the case. It is provided as extras/groups-virt.example.
"make install" should correctly install this file, and the rpm packages
should include it.
Change-Id: I5284306cfc2882e3147bd72f496ad29db906fcb2
BUG: 1053854
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/6717
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | extras/Makefile.am | 17 | ||||
| -rw-r--r-- | glusterfs.spec.in | 7 |
2 files changed, 15 insertions, 9 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am index 2633e20a571..faa91cddf45 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -5,14 +5,17 @@ SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM geo-re confdir = $(sysconfdir)/glusterfs conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \ - logger.conf.example glusterfs-georep-logrotate + logger.conf.example glusterfs-georep-logrotate group-virt.example voldir = $(sysconfdir)/glusterfs vol_DATA = glusterd.vol -EXTRA_DIST = specgen.scm MacOSX/Portfile glusterfs-mode.el glusterfs.vim \ - migrate-unify-to-distribute.sh backend-xattr-sanitize.sh \ - backend-cleanup.sh disk_usage_sync.sh glusterfs-logrotate \ - clear_xattrs.sh group-virt.example glusterd-sysconfig \ - gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \ - logger.conf.example glusterd.vol glusterfs-georep-logrotate +EXTRA_DIST = $(conf_DATA) specgen.scm MacOSX/Portfile glusterfs-mode.el \ + glusterfs.vim migrate-unify-to-distribute.sh backend-xattr-sanitize.sh \ + backend-cleanup.sh disk_usage_sync.sh clear_xattrs.sh \ + glusterd-sysconfig glusterd.vol + +install-data-local: + $(mkdir_p) $(DESTDIR)$(localstatedir)/lib/glusterd/groups + $(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \ + $(DESTDIR)$(localstatedir)/lib/glusterd/groups/virt diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 516ca513f19..c855c842397 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -605,7 +605,6 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/glustershd mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/peers mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/vols -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/groups mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid @@ -720,6 +719,8 @@ fi %endif %config(noreplace) %{_sysconfdir}/sysconfig/glusterd %config(noreplace) %{_sysconfdir}/glusterfs +%dir %{_sharedstatedir}/glusterd/groups +%config(noreplace) %{_sharedstatedir}/glusterd/groups/virt # Legacy configs %if ( 0%{_for_fedora_koji_builds} ) %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd @@ -768,7 +769,6 @@ fi %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run @@ -872,6 +872,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Wed Jan 15 2014 Niels de Vos <ndevos@redhat.com> +- Install /var/lib/glusterd/groups/virt by default + * Sat Jan 4 2014 Niels de Vos <ndevos@redhat.com> - The main glusterfs package should not provide glusterfs-libs (#1048489) |