1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From b343592b45c91db8c18e863fac5ab8eeb94445d6 Mon Sep 17 00:00:00 2001
From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Date: Wed, 26 Mar 2014 11:35:09 -0400
Subject: [PATCH] network.c: Add missing LXC_NET_NONE option + refactor
Add LXC_NET_NONE to known lxc_network_types, so parsing a config
file with lxc.network.type = none does not result in failure
(e.g. doc/examples/lxc-no-netns.conf). Options have also been
reordered to match the enum in conf.h.
Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---
src/lxc/network.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lxc/network.c b/src/lxc/network.c
index 090b9bd..a9900de 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -1202,11 +1202,12 @@ int lxc_bridge_attach(const char *bridge, const char *ifname)
}
static const char* const lxc_network_types[LXC_NET_MAXCONFTYPE + 1] = {
+ [LXC_NET_EMPTY] = "empty",
[LXC_NET_VETH] = "veth",
[LXC_NET_MACVLAN] = "macvlan",
- [LXC_NET_VLAN] = "vlan",
[LXC_NET_PHYS] = "phys",
- [LXC_NET_EMPTY] = "empty",
+ [LXC_NET_VLAN] = "vlan",
+ [LXC_NET_NONE] = "none",
};
const char *lxc_net_type_to_str(int type)
--
1.9.rc1
|
