]>
Commit | Line | Data |
---|---|---|
1513a0b5 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
ade16ee6 WB |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> |
3 | Date: Fri, 10 Feb 2017 09:15:37 +0100 | |
2d8021b3 | 4 | Subject: [PATCH] PVE: [Down] run lxcnetaddbr when instantiating veths |
ade16ee6 WB |
5 | |
6 | FIXME: Why aren't we using regular up-scripts? | |
7 | ||
8 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
9 | --- | |
f39a178a WB |
10 | src/lxc/network.c | 5 +++++ |
11 | 1 file changed, 5 insertions(+) | |
ade16ee6 | 12 | |
f39a178a | 13 | diff --git a/src/lxc/network.c b/src/lxc/network.c |
8a25e884 | 14 | index d0f14e632..9337ad4d9 100644 |
f39a178a WB |
15 | --- a/src/lxc/network.c |
16 | +++ b/src/lxc/network.c | |
834bb4d7 | 17 | @@ -195,6 +195,11 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd |
1513a0b5 WB |
18 | netdev->upscript, "up", argv); |
19 | if (err < 0) | |
ade16ee6 | 20 | goto out_delete; |
f39a178a | 21 | + } else if (netdev->link[0] == '\0') { |
ade16ee6 WB |
22 | + err = run_script(handler->name, "net", "/usr/share/lxc/lxcnetaddbr", "up", |
23 | + "veth", veth1, (char*) NULL); | |
24 | + if (err) | |
25 | + goto out_delete; | |
26 | } | |
ade16ee6 | 27 | |
f39a178a | 28 | DEBUG("Instantiated veth \"%s/%s\", index is \"%d\"", veth1, veth2, |
ade16ee6 | 29 | -- |
8a25e884 | 30 | 2.20.1 |
ade16ee6 | 31 |