X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=63c31c2518bcf65e77fa1c26a26f2703f0baad72;hb=a1525581ae3aff3da7f12fe7b1ec76b568bf098a;hp=ba9052872a70325a260dd82f938496d773a50cb6;hpb=952efc486da04bcb8c9d6ad01383e28632b7d140;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index ba905287..63c31c25 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;