From 60acdbd87a2c3d5bf1b199b91a7d154467fe1b79 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 10 Jan 2017 10:49:07 +0100 Subject: 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 > Reviewed-on: http://review.gluster.org/16351 > Smoke: Gluster Build System > Tested-by: Kaleb KEITHLEY > CentOS-regression: Gluster Build System > NetBSD-regression: NetBSD Build System > Reviewed-by: Kaleb KEITHLEY Change-Id: Ibbbc18cc394f8b1e5ba74927effc41c466667479 BUG: 1410854 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/16369 Reviewed-by: Kaleb KEITHLEY Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') 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 -- cgit