|
 |
cb8e9e |
From 066cf007f2f6ac3f2f1037c035504c37da5d31b3 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: "Bala.FA" <barumuga@redhat.com>
|
|
|
cb8e9e |
Date: Mon, 7 Apr 2014 15:24:10 +0530
|
|
|
cb8e9e |
Subject: [PATCH 16/18] build: remove ghost directory entries
|
|
|
cb8e9e |
|
|
|
cb8e9e |
ovirt requires hook directories for gluster management and ghost
|
|
|
cb8e9e |
directories are no more ghost entries
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Label: DOWNSTREAM ONLY
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: Iaf1066ba0655619024f87eaaa039f0010578c567
|
|
|
cb8e9e |
Signed-off-by: Bala.FA <barumuga@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
glusterfs.spec.in | 71 +++++++------------------------------------------------
|
|
|
cb8e9e |
1 file changed, 9 insertions(+), 62 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
cb8e9e |
index a5a884f..d60a618 100644
|
|
|
cb8e9e |
--- a/glusterfs.spec.in
|
|
|
cb8e9e |
+++ b/glusterfs.spec.in
|
|
|
cb8e9e |
@@ -695,7 +695,6 @@ install -D -p -m 0644 extras/glusterfs-logrotate \
|
|
|
cb8e9e |
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
|
|
|
cb8e9e |
|
|
|
cb8e9e |
%if ( 0%{!?_without_georeplication:1} )
|
|
|
cb8e9e |
-# geo-rep ghosts
|
|
|
cb8e9e |
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
|
|
|
cb8e9e |
touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
|
|
|
cb8e9e |
install -D -p -m 0644 extras/glusterfs-georep-logrotate \
|
|
|
cb8e9e |
@@ -719,41 +718,13 @@ install -D -p -m 0644 extras/logger.conf.example \
|
|
|
cb8e9e |
%endif
|
|
|
cb8e9e |
%endif
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-# the rest of the ghosts
|
|
|
cb8e9e |
touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
|
|
|
cb8e9e |
touch %{buildroot}%{_sharedstatedir}/glusterd/options
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/reset
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/reset/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/reset/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/pre
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post
|
|
|
cb8e9e |
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre
|
|
|
cb8e9e |
+subdirs=("add-brick" "create" "copy-file" "delete" "gsync-create" "remove-brick" "reset" "set" "start" "stop")
|
|
|
cb8e9e |
+for dir in ${subdirs[@]}
|
|
|
cb8e9e |
+do
|
|
|
cb8e9e |
+mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/"$dir"/{pre,post}
|
|
|
cb8e9e |
+done
|
|
|
cb8e9e |
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/glustershd
|
|
|
cb8e9e |
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/peers
|
|
|
cb8e9e |
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/vols
|
|
|
cb8e9e |
@@ -1051,11 +1022,7 @@ fi
|
|
|
cb8e9e |
%{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh
|
|
|
cb8e9e |
%{_libexecdir}/glusterfs/peer_gsec_create
|
|
|
cb8e9e |
%{_libexecdir}/glusterfs/peer_mountbroker
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
|
|
|
cb8e9e |
-%dir %{_sharedstatedir}/glusterd/hooks
|
|
|
cb8e9e |
-%dir %{_sharedstatedir}/glusterd/hooks/1
|
|
|
cb8e9e |
-%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create
|
|
|
cb8e9e |
-%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post
|
|
|
cb8e9e |
+%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
|
|
|
cb8e9e |
%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh
|
|
|
cb8e9e |
%{_datadir}/glusterfs/scripts/get-gfid.sh
|
|
|
cb8e9e |
%{_datadir}/glusterfs/scripts/slave-upgrade.sh
|
|
|
cb8e9e |
@@ -1104,7 +1071,7 @@ fi
|
|
|
cb8e9e |
%if 0%{?_tmpfilesdir:1}
|
|
|
cb8e9e |
%{_tmpfilesdir}/gluster.conf
|
|
|
cb8e9e |
%endif
|
|
|
cb8e9e |
-%dir %{_sharedstatedir}/glusterd
|
|
|
cb8e9e |
+%{_sharedstatedir}/glusterd/*
|
|
|
cb8e9e |
%dir %{_sharedstatedir}/glusterd/groups
|
|
|
cb8e9e |
%config(noreplace) %{_sharedstatedir}/glusterd/groups/virt
|
|
|
cb8e9e |
# Legacy configs
|
|
|
cb8e9e |
@@ -1170,28 +1137,8 @@ fi
|
|
|
cb8e9e |
|
|
|
cb8e9e |
%ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
|
|
|
cb8e9e |
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
|
|
|
cb8e9e |
-# This is really ugly, but I have no idea how to mark these directories in
|
|
|
cb8e9e |
-# any other way. They should belong to the glusterfs-server package, but
|
|
|
cb8e9e |
-# don't exist after installation. They are generated on the first start...
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/pre
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs
|
|
|
cb8e9e |
-%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
|
|
|
cb8e9e |
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
|
|
|
cb8e9e |
-%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
|
|
|
cb8e9e |
+%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
|
|
|
cb8e9e |
+%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
|
|
|
cb8e9e |
|
|
|
cb8e9e |
# Extra utility script
|
|
|
cb8e9e |
%{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.9.3
|
|
|
cb8e9e |
|