vswitchd: Enable updating resolv.conf by default when using discovery
authorJustin Pettit <jpettit@nicira.com>
Wed, 1 Jul 2009 20:58:19 +0000 (13:58 -0700)
committerJustin Pettit <jpettit@nicira.com>
Wed, 1 Jul 2009 20:58:19 +0000 (13:58 -0700)
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.

vswitchd/bridge.c

index ba9052872a70325a260dd82f938496d773a50cb6..63c31c2518bcf65e77fa1c26a26f2703f0baad72 100644 (file)
@@ -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;