From: Stéphane Graber <stgraber@ubuntu.com>
Date: Wed, 3 Dec 2014 16:01:45 +0000 (-0500)
Subject: Improve veth error cases logging
X-Git-Tag: lxc-1.1.0.alpha3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e2d6a7be9d62e9646c35d87119af3e767754edf;p=thirdparty%2Flxc.git

Improve veth error cases logging

The previous error message made it look like the host interface name was
the concatenation of both the host and guest interface names.

Closes #374

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 90df4d256..b94bf1878 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2822,7 +2822,7 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
 
 	err = lxc_veth_create(veth1, veth2);
 	if (err) {
-		ERROR("failed to create %s-%s : %s", veth1, veth2,
+		ERROR("failed to create veth pair (%s and %s): %s", veth1, veth2,
 		      strerror(-err));
 		goto out_delete;
 	}
@@ -2832,7 +2832,7 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
 	 * of a container */
 	err = setup_private_host_hw_addr(veth1);
 	if (err) {
-		ERROR("failed to change mac address of host interface '%s' : %s",
+		ERROR("failed to change mac address of host interface '%s': %s",
 			veth1, strerror(-err));
 		goto out_delete;
 	}
@@ -2842,7 +2842,7 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
 		if (!err)
 			err = lxc_netdev_set_mtu(veth2, atoi(netdev->mtu));
 		if (err) {
-			ERROR("failed to set mtu '%s' for %s-%s : %s",
+			ERROR("failed to set mtu '%s' for veth pair (%s and %s): %s",
 			      netdev->mtu, veth1, veth2, strerror(-err));
 			goto out_delete;
 		}
@@ -2851,7 +2851,7 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
 	if (netdev->link) {
 		err = lxc_bridge_attach(netdev->link, veth1);
 		if (err) {
-			ERROR("failed to attach '%s' to the bridge '%s' : %s",
+			ERROR("failed to attach '%s' to the bridge '%s': %s",
 				      veth1, netdev->link, strerror(-err));
 			goto out_delete;
 		}