|
 |
d1681e |
From 6ed11f5918cf21907df99839c9b76cf1144b2572 Mon Sep 17 00:00:00 2001
|
|
|
d1681e |
From: "Bala.FA" <barumuga@redhat.com>
|
|
|
3604df |
Date: Mon, 7 Apr 2014 15:24:10 +0530
|
|
|
d1681e |
Subject: [PATCH 07/74] build: remove ghost directory entries
|
|
|
3604df |
|
|
|
3604df |
ovirt requires hook directories for gluster management and ghost
|
|
|
3604df |
directories are no more ghost entries
|
|
|
3604df |
|
|
|
3604df |
Label: DOWNSTREAM ONLY
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Iaf1066ba0655619024f87eaaa039f0010578c567
|
|
|
3604df |
Signed-off-by: Bala.FA <barumuga@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/60133
|
|
|
3604df |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
---
|
|
|
d1681e |
glusterfs.spec.in | 20 ++++++++++++++++++--
|
|
|
d1681e |
1 file changed, 18 insertions(+), 2 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
d1681e |
index 50db6cb..3be99b6 100644
|
|
|
3604df |
--- a/glusterfs.spec.in
|
|
|
3604df |
+++ b/glusterfs.spec.in
|
|
|
d1681e |
@@ -757,14 +757,29 @@ install -D -p -m 0644 extras/glusterfs-logrotate \
|
|
|
3604df |
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
|
|
|
3604df |
|
|
|
3604df |
%if ( 0%{!?_without_georeplication:1} )
|
|
|
3604df |
-# geo-rep ghosts
|
|
|
3604df |
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
|
|
|
3604df |
touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
|
|
|
3604df |
install -D -p -m 0644 extras/glusterfs-georep-logrotate \
|
|
|
3604df |
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
|
|
|
3604df |
%endif
|
|
|
3604df |
|
|
|
3604df |
-# the rest of the ghosts
|
|
|
3604df |
+%if ( 0%{!?_without_syslog:1} )
|
|
|
3604df |
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
|
|
|
3604df |
+install -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \
|
|
|
3604df |
+ %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
|
|
3604df |
+%endif
|
|
|
3604df |
+
|
|
|
3604df |
+%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
|
|
3604df |
+install -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \
|
|
|
3604df |
+ %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
|
|
3604df |
+%endif
|
|
|
3604df |
+
|
|
|
3604df |
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
|
|
3604df |
+install -D -p -m 0644 extras/logger.conf.example \
|
|
|
3604df |
+ %{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example
|
|
|
3604df |
+%endif
|
|
|
3604df |
+%endif
|
|
|
3604df |
+
|
|
|
3604df |
touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
|
|
|
3604df |
touch %{buildroot}%{_sharedstatedir}/glusterd/options
|
|
|
3604df |
subdirs=(add-brick create copy-file delete gsync-create remove-brick reset set start stop)
|
|
|
d1681e |
@@ -1262,6 +1277,7 @@ exit 0
|
|
|
3604df |
%{_sbindir}/gcron.py
|
|
|
d1681e |
%{_sbindir}/conf.py
|
|
|
3604df |
|
|
|
3604df |
+<<<<<<< 2944c7b6656a36a79551f9f9f24ab7a10467f13a
|
|
|
3604df |
# /var/lib/glusterd, e.g. hookscripts, etc.
|
|
|
3604df |
%ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
|
|
|
3604df |
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd
|
|
|
3604df |
--
|
|
|
d1681e |
1.8.3.1
|
|
|
3604df |
|