Just before pushing the series containing commit 3bba4825 I had added
a "return true" to the top of virFirewallDZoneExists() to measure the
impact of calling that function once per network during startup. I
found that the effect was minimal, but forgot to remove the "return
true" before pushing. This unfortunately causes a failure to start
networks on systems that have a firewalld version that doesn't support
our libvirt zone file (i.e. pretty much everyone).
This patch removes the unintended line.
Signed-off-by: Laine Stump <laine(a)laine.org>
---
Pushed as trivial / buildbreaker.
src/util/virfirewalld.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
index ca03020f74..47bacdcf4a 100644
--- a/src/util/virfirewalld.c
+++ b/src/util/virfirewalld.c
@@ -235,8 +235,6 @@ virFirewallDZoneExists(const char *match)
char **zones = NULL;
bool result = false;
- return true;
-
if (virFirewallDGetZones(&zones, &nzones) < 0)
goto cleanup;
--
2.20.1
Show replies by date