diff options
| author | Niels de Vos <ndevos@redhat.com> | 2017-01-10 10:51:00 +0100 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-01-12 08:07:40 -0800 |
| commit | e87e2e37499be772a31191dd45bf3a362a93ffde (patch) | |
| tree | 435efa7702273afff03a519c63f72505847a7583 /configure.ac | |
| parent | e5f3a990cdcf474f0d27f0394095eb2fdd8a3bd3 (diff) | |
rpm: depend on firewalld-filesystem for directory ownership
Also use the %firewalld_reload macro that is provided by the
firewalld-filesystem package.
Cherry picked from commit f99750b4477538cd1f97ce6340e1813202f986e2:
> BUG: 1410853
> Change-Id: Ibbbc18cc394f8b1e5ba74927effc41c466667479
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-on: http://review.gluster.org/16351
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Tested-by: Kaleb KEITHLEY <kkeithle@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Change-Id: Ibbbc18cc394f8b1e5ba74927effc41c466667479
BUG: 1410852
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/16370
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index cfefa218156..5a7231262d9 100644 --- a/configure.ac +++ b/configure.ac @@ -726,7 +726,7 @@ AC_ARG_ENABLE([firewalld], [BUILD_FIREWALLD="${enableval}"], [BUILD_FIREWALLD="no"]) if test "x${BUILD_FIREWALLD}" = "xyes"; then - if !(which firewalld 1>/dev/null 2>&1) ; then + if !(test -d /usr/lib/firewalld/services 1>/dev/null 2>&1) ; then BUILD_FIREWALLD="no (firewalld not installed)" fi fi |