summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2017-01-10 10:49:07 +0100
committerKaleb KEITHLEY <kkeithle@redhat.com>2017-01-12 08:07:23 -0800
commit60acdbd87a2c3d5bf1b199b91a7d154467fe1b79 (patch)
treeeed556fc813f6fb4063d7a4b027e10dcaa4ad27b /configure.ac
parentac576a53877bdcfc3b80d08932deeea7dfe0eb32 (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: 1410854 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/16369 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.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 591ba3e0b9f..df8891277be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -810,7 +810,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