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 cb30d56b8210ddfc4d719742170700de6940097b..4c1156d7ea7194f88a7de5882b55a3e95cb2c0a8 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2945,7 +2945,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;
        }
@@ -2955,7 +2955,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;
        }
@@ -2965,7 +2965,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;
                }
@@ -2974,7 +2974,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;
                }