From 1e1f9b950d1ee7f22fad457f6158dc91faf63b89 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Fri, 4 Aug 2017 12:41:22 +0530 Subject: [PATCH 593/593] packaging: /var/lib/glusterd/options should be %config(noreplace) /var/lib/glusterd/options is where cluster.enabled-shared-storage is persisted. If the file is removed as part of an uninstall/reinstall or update then the state of shared storage could be lost. mainline: > BUG: 1476861 > Signed-off-by: Kaleb S. KEITHLEY > Reviewed-on: https://review.gluster.org/17930 > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > Reviewed-by: Atin Mukherjee > Reviewed-by: Shyamsundar Ranganathan (cherry picked from commit f17eefb6d9a91cfccc3bef3aa3ba08a9128b046e) Change-Id: Ie18c3d883df71c1857fd6996d9c03ab247580b70 BUG: 1476867 Signed-off-by: Milind Changire Reviewed-on: https://code.engineering.redhat.com/gerrit/114355 Reviewed-by: Niels de Vos --- glusterfs.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index b1feedc..3e816ae 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1455,7 +1455,7 @@ exit 0 %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid -%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options +%config(noreplace) %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub @@ -2102,6 +2102,9 @@ end %endif %changelog +* Fri Aug 04 2017 Kaleb S. KEITHLEY +- /var/lib/glusterd/options made config(noreplace) to avoid losing shared state info + * Tue Jul 04 2017 Milind Changire - moved %{_sbindir}/gf_attach from glusterfs-fuse to glusterfs-server -- 1.8.3.1