From: Daniel P. Berrange Date: Wed, 2 May 2007 15:51:14 +0000 (+0000) Subject: Use --strict-order with dnsmasq X-Git-Tag: LIVIRT_0_2_3~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a12fee1352d1784f20413ce851da3d4394ef346;p=thirdparty%2Flibvirt.git Use --strict-order with dnsmasq --- diff --git a/ChangeLog b/ChangeLog index 35ad44e6de..438c867bb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed May 2 11:50:35 EST 2007 Daniel P. Berrange + + * qemud/qemud.c: Use --strict-order when running dnsmasq + Mon Apr 30 18:33:00 BST 2007 Richard W.M. Jones * src/libvirt.c, src/driver.h, src/proxy_internal.c, diff --git a/qemud/qemud.c b/qemud/qemud.c index 7d67bde062..e2f28180fa 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1110,6 +1110,7 @@ qemudBuildDnsmasqArgv(struct qemud_server *server, len = 1 + /* dnsmasq */ 1 + /* --keep-in-foreground */ + 1 + /* --strict-order */ 1 + /* --bind-interfaces */ 2 + /* --pid-file "" */ 2 + /* --conf-file "" */ @@ -1133,6 +1134,11 @@ qemudBuildDnsmasqArgv(struct qemud_server *server, APPEND_ARG(*argv, i++, "dnsmasq"); APPEND_ARG(*argv, i++, "--keep-in-foreground"); + /* + * Needed to ensure dnsmasq uses same algorithm for processing + * multiple nameserver entries in /etc/resolv.conf as GLibC. + */ + APPEND_ARG(*argv, i++, "--strict-order"); APPEND_ARG(*argv, i++, "--bind-interfaces"); APPEND_ARG(*argv, i++, "--pid-file");