|
 |
256ebe |
From 1f28e008825ae291208a9e6c714dd642f715a2a1 Mon Sep 17 00:00:00 2001
|
|
|
256ebe |
From: "Bala.FA" <barumuga@redhat.com>
|
|
|
256ebe |
Date: Mon, 7 Apr 2014 15:24:10 +0530
|
|
|
256ebe |
Subject: [PATCH 06/52] build: remove ghost directory entries
|
|
|
256ebe |
|
|
|
256ebe |
ovirt requires hook directories for gluster management and ghost
|
|
|
256ebe |
directories are no more ghost entries
|
|
|
256ebe |
|
|
|
256ebe |
Label: DOWNSTREAM ONLY
|
|
|
256ebe |
|
|
|
256ebe |
Change-Id: Iaf1066ba0655619024f87eaaa039f0010578c567
|
|
|
256ebe |
Signed-off-by: Bala.FA <barumuga@redhat.com>
|
|
|
256ebe |
Reviewed-on: https://code.engineering.redhat.com/gerrit/60133
|
|
|
256ebe |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
256ebe |
---
|
|
|
256ebe |
glusterfs.spec.in | 19 +++++++++++++++++--
|
|
|
256ebe |
1 file changed, 17 insertions(+), 2 deletions(-)
|
|
|
256ebe |
|
|
|
256ebe |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
256ebe |
index f5c1f79..6be492e 100644
|
|
|
256ebe |
--- a/glusterfs.spec.in
|
|
|
256ebe |
+++ b/glusterfs.spec.in
|
|
|
256ebe |
@@ -799,15 +799,30 @@ install -D -p -m 0644 extras/glusterfs-logrotate \
|
|
|
256ebe |
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
|
|
|
256ebe |
|
|
|
256ebe |
%if ( 0%{!?_without_georeplication:1} )
|
|
|
256ebe |
-# geo-rep ghosts
|
|
|
256ebe |
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
|
|
|
256ebe |
touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
|
|
|
256ebe |
install -D -p -m 0644 extras/glusterfs-georep-logrotate \
|
|
|
256ebe |
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
|
|
|
256ebe |
%endif
|
|
|
256ebe |
|
|
|
256ebe |
+%if ( 0%{!?_without_syslog:1} )
|
|
|
256ebe |
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
|
|
|
256ebe |
+install -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \
|
|
|
256ebe |
+ %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
|
|
256ebe |
+%endif
|
|
|
256ebe |
+
|
|
|
256ebe |
+%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
|
|
256ebe |
+install -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \
|
|
|
256ebe |
+ %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
|
|
256ebe |
+%endif
|
|
|
256ebe |
+
|
|
|
256ebe |
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
|
|
256ebe |
+install -D -p -m 0644 extras/logger.conf.example \
|
|
|
256ebe |
+ %{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example
|
|
|
256ebe |
+%endif
|
|
|
256ebe |
+%endif
|
|
|
256ebe |
+
|
|
|
256ebe |
%if ( 0%{!?_without_server:1} )
|
|
|
256ebe |
-# the rest of the ghosts
|
|
|
256ebe |
touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
|
|
|
256ebe |
touch %{buildroot}%{_sharedstatedir}/glusterd/options
|
|
|
256ebe |
subdirs=(add-brick create copy-file delete gsync-create remove-brick reset set start stop)
|
|
|
256ebe |
--
|
|
|
256ebe |
1.8.3.1
|
|
|
256ebe |
|