Unverified Commit f177506f by Stéphane Graber Committed by GitHub

Merge pull request #3190 from idatahu/fix_ovs_log

fix wrong order of bridge/nic in error message
parents e166e391 53796b94
...@@ -2466,7 +2466,7 @@ int lxc_ovs_delete_port(const char *bridge, const char *nic) ...@@ -2466,7 +2466,7 @@ int lxc_ovs_delete_port(const char *bridge, const char *nic)
lxc_ovs_delete_port_exec, (void *)&args); lxc_ovs_delete_port_exec, (void *)&args);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to delete \"%s\" from openvswitch bridge \"%s\": " ERROR("Failed to delete \"%s\" from openvswitch bridge \"%s\": "
"%s", bridge, nic, cmd_output); "%s", nic, bridge, cmd_output);
return -1; return -1;
} }
...@@ -2494,7 +2494,7 @@ static int lxc_ovs_attach_bridge(const char *bridge, const char *nic) ...@@ -2494,7 +2494,7 @@ static int lxc_ovs_attach_bridge(const char *bridge, const char *nic)
lxc_ovs_attach_bridge_exec, (void *)&args); lxc_ovs_attach_bridge_exec, (void *)&args);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to attach \"%s\" to openvswitch bridge \"%s\": %s", ERROR("Failed to attach \"%s\" to openvswitch bridge \"%s\": %s",
bridge, nic, cmd_output); nic, bridge, cmd_output);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment