diff options
| author | Kevin Vigor <kvigor@fb.com> | 2017-01-23 10:27:52 -0800 |
|---|---|---|
| committer | Kevin Vigor <kvigor@fb.com> | 2017-01-23 10:27:52 -0800 |
| commit | f80281c05e3f1c0ead5910586c7e81f047add623 (patch) | |
| tree | f58cac77acef73cfdf14d420bd10613ad3dc1850 /glusterfs.spec.in | |
| parent | 6f6a21f1bbc5131e70b42d89a5ac8d8aa709ad3f (diff) | |
| parent | b21c51e6f0baa5145923637f54e79d221ca59cff (diff) | |
Merge remote-tracking branch 'origin/release-3.8' into merge-3.8
Change-Id: Ie6c73dee0b6798af4a69c43c0b03c3d02ff36aa2
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 29bf00c60a9..29d07c530c0 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -226,7 +226,7 @@ BuildRequires: libattr-devel %endif %if (0%{?_with_firewalld:1}) -BuildRequires: firewalld +BuildRequires: firewalld-filesystem %endif Obsoletes: hekafs @@ -541,6 +541,10 @@ Requires(preun): /sbin/service Requires(preun): /sbin/chkconfig Requires(postun): /sbin/service %endif +%if (0%{?_with_firewalld:1}) +# we install firewalld rules, so we need to have the directory owned +Requires: firewalld-filesystem +%endif %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) Requires: rpcbind %else @@ -811,11 +815,7 @@ if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then fi %if (0%{?_with_firewalld:1}) -#reload service files if firewalld running -if $(systemctl is-active firewalld 1>/dev/null 2>&1); then - #firewalld-filesystem is not available for rhel7, so command used for reload. - firewall-cmd --reload 1>/dev/null 2>&1 -fi + %firewalld_reload %endif pidof -c -o %PPID -x glusterd &> /dev/null @@ -883,10 +883,7 @@ exit 0 %postun server /sbin/ldconfig %if (0%{?_with_firewalld:1}) -#reload service files if firewalld running -if $(systemctl is-active firewalld 1>/dev/null 2>&1); then - firewall-cmd --reload -fi + %firewalld_reload %endif exit 0 @@ -1195,6 +1192,9 @@ exit 0 %endif %changelog +* Fri Jan 6 2017 Niels de Vos <ndevos@redhat.com> +- use macro provided by firewalld-filesystem to reload firewalld + * Thu Dec 19 2016 Jiffin Tony Thottan <jhottan@redhat.com> - remove S31ganesha-reset.sh from hooks (#1405951) |