Skip to content
Snippets Groups Projects
Commit 6db6929f authored by Guido Günther's avatar Guido Günther
Browse files

Catch dnsmasq start failures

parent 1b0e5775
No related branches found
No related tags found
No related merge requests found
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 23 Jul 2011 23:24:21 +0200
Subject: Catch dnsmasq start failures
While we checked the return value we didn't maks sure ret != 0 which
resulted in dnsmasq errors being ignored.
---
src/network/bridge_driver.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 660dd65..7cedbfd 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -732,8 +732,10 @@ networkStartDhcpDaemon(virNetworkObjPtr network)
if (ret < 0)
goto cleanup;
- if (virCommandRun(cmd, NULL) < 0)
+ ret = virCommandRun(cmd, NULL);
+ if (ret < 0) {
goto cleanup;
+ }
/*
* There really is no race here - when dnsmasq daemonizes, its
--
......@@ -9,3 +9,4 @@ Disable-daemon-start-test.patch
Disable-gnulib-s-test-nonplocking-pipe.sh.patch
Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
Disable-failing-virnetsockettest.patch
Catch-dnsmasq-start-failures.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment