From: Ben Pfaff <blp@nicira.com>
Date: Tue, 16 Nov 2010 20:23:12 +0000 (-0800)
Subject: ovs-vsctl: Make waiting for ovs-vswitchd to reload work again.
X-Git-Tag: v1.1.0~845
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=b8fa71021e738a8c77cb17ec0a0897230db1d61b;p=sliver-openvswitch.git

ovs-vsctl: Make waiting for ovs-vswitchd to reload work again.

Bug introduced in commit e5e12280e "ovs-vsctl: Replicate only tables and
columns that are actually needed."

Reported-by: Paul Ingram <paul@nicira.com>
---

diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index ec1cfb3f0..43aeb01fb 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -3042,6 +3042,9 @@ run_prerequisites(struct vsctl_command *commands, size_t n_commands,
     struct vsctl_command *c;
 
     ovsdb_idl_add_table(idl, &ovsrec_table_open_vswitch);
+    if (wait_for_reload) {
+        ovsdb_idl_add_column(idl, &ovsrec_open_vswitch_col_cur_cfg);
+    }
     for (c = commands; c < &commands[n_commands]; c++) {
         if (c->syntax->prerequisites) {
             struct vsctl_context ctx;