allow link-less veth devices

Before, a veth device pair required a link which was treated as a bridge device. Code crashed if there was no lxc.network.link specified. Fix that by allowing lxc.network.link to be unset Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

allow link-less veth devices
734915ac · Michael Tokarev · Daniel Lezcano · 7418c9ce · 734915ac
Commit 734915ac authored Nov 20, 2009 by Michael Tokarev Committed by Daniel Lezcano Nov 20, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

conf.c src/lxc/conf.c +2 -3

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -845,8 +845,7 @@ static int instanciate_veth(struct lxc_netdev *netdev)
 	}
 	if (lxc_veth_create(veth1, veth2)) {
-		ERROR("failed to create %s-%s/%s",
+		ERROR("failed to create %s-%s", veth1, veth2);
-		      veth1, veth2, netdev->link);
 		goto out;
 	}
@@ -864,7 +863,7 @@ static int instanciate_veth(struct lxc_netdev *netdev)
 		}
 	}
-	if (lxc_bridge_attach(netdev->link, veth1)) {
+	if (netdev->link && lxc_bridge_attach(netdev->link, veth1)) {
 		ERROR("failed to attach '%s' to the bridge '%s'",
 			      veth1, netdev->link);
 		goto out_delete;