summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2017-01-13 14:31:27 +0100
committerKaleb KEITHLEY <kkeithle@redhat.com>2017-01-14 03:03:24 -0800
commitdb079ea2be121cfa3616de2b6dae844ab5a979c2 (patch)
tree8ce114d249e1f9f9cb8e314e537925602752aade
parent4d529702fa0f3e619f78fbbbbf3b1b819996a354 (diff)
rpm: fix glusterfs-server(%postun) scriptlet error
While introducing the usage of the %firewalld_restart macro, the old scriplet was not correctly removed. This causes an error to be displayed when the RPM gets updated or uninstalled. Cherry picked from commit e3d09359b2090c0dc9160b693969f69ecda3477c: > Fixes: f99750b4477538cd1f97ce6340e1813202f986e2 > Change-Id: I69091d8e9e3c412dc3cb52246967eac29d2ebc90 > BUG: 1410853 > Signed-off-by: Niels de Vos <ndevos@redhat.com> Fixes: e87e2e37499be772a31191dd45bf3a362a93ffde Change-Id: I69091d8e9e3c412dc3cb52246967eac29d2ebc90 BUG: 1410852 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/16410 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r--glusterfs.spec.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 7d789310036..66c9a46a2be 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -873,7 +873,6 @@ exit 0
/sbin/ldconfig
%if (0%{?_with_firewalld:1})
%firewalld_reload
-fi
%endif
exit 0