Skip to content

L
lxc
Commit 0b462e93 by Bogdan Purcareata Committed by Stéphane Graber
Options

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: 's avatarBogdan Purcareata <bogdan.purcareata@freescale.com> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 13530116
Showing with 3 additions and 2 deletions
src/lxc/network.c
...@@ -1202,11 +1202,12 @@ int lxc_bridge_attach(const char *bridge, const char *ifname) ...@@ -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] = { static const char* const lxc_network_types[LXC_NET_MAXCONFTYPE + 1] = {
[LXC_NET_EMPTY] = "empty",
[LXC_NET_VETH] = "veth", [LXC_NET_VETH] = "veth",
[LXC_NET_MACVLAN] = "macvlan", [LXC_NET_MACVLAN] = "macvlan",
[LXC_NET_VLAN] = "vlan",
[LXC_NET_PHYS] = "phys", [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) const char *lxc_net_type_to_str(int type)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment