From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 1 Jul 2009 20:58:19 +0000 (-0700)
Subject: vswitchd: Enable updating resolv.conf by default when using discovery
X-Git-Tag: v0.90.3~3^2~35
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a1525581ae3aff3da7f12fe7b1ec76b568bf098a;p=sliver-openvswitch.git

vswitchd: Enable updating resolv.conf by default when using discovery

When vSwitch does discovery, it is supposed to update resolv.conf by
default.  The way configuration parameters were being read, it would
disable this update by default.
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index ba9052872..63c31c251 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1076,10 +1076,14 @@ bridge_reconfigure_controller(struct bridge *br)
         int rate_limit, burst_limit;
 
         if (!strcmp(controller, "discover")) {
+            bool update_resolv_conf = true;
+
+            if (cfg_has("%s.update-resolv.conf", pfx)) {
+                update_resolv_conf = cfg_get_bool(0, "%s.update-resolv.conf");
+            }
             ofproto_set_discovery(br->ofproto, true,
                                   cfg_get_string(0, "%s.accept-regex", pfx),
-                                  cfg_get_bool(0, "%s.update-resolv.conf",
-                                               pfx));
+                                  update_resolv_conf);
         } else {
             struct netdev *netdev;
             bool in_band;