The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3190
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Seems to be a simple mixup.
Found in LXC 3.0.3 shipped with Ubuntu 18.04.
From 53796b941e1c507eaef2fc8ed977cd618a04ce11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20P=C3=B3ka?= <p...@idata.hu>
Date: Wed, 20 Nov 2019 20:57:28 +0100
Subject: [PATCH] fix wrong order of bridge/nic in error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Balázs Póka <p...@idata.hu>
---
src/lxc/network.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/network.c b/src/lxc/network.c
index 65727f6b5a..31282e4aa1 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -2466,7 +2466,7 @@ int lxc_ovs_delete_port(const char *bridge, const char
*nic)
lxc_ovs_delete_port_exec, (void *)&args);
if (ret < 0) {
ERROR("Failed to delete \"%s\" from openvswitch bridge \"%s\": "
- "%s", bridge, nic, cmd_output);
+ "%s", nic, bridge, cmd_output);
return -1;
}
@@ -2494,7 +2494,7 @@ static int lxc_ovs_attach_bridge(const char *bridge,
const char *nic)
lxc_ovs_attach_bridge_exec, (void *)&args);
if (ret < 0) {
ERROR("Failed to attach \"%s\" to openvswitch bridge \"%s\":
%s",
- bridge, nic, cmd_output);
+ nic, bridge, cmd_output);
return -1;
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
