Skip to content

L
lxc
Commit afab343e by Tycho Andersen Committed by Stéphane Graber
Options

c/r: allow empty networks to be checkpointed/restored

Empty networks don't have anything (besides lo) for us to dump and restore, so we should allow these as well. Reported-by: 's avatarDietmar Maurer <dietmar@proxmox.com> Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent b77a2e31
Showing with 13 additions and 1 deletion
src/lxc/criu.c
......@@ -164,6 +164,9 @@ void exec_criu(struct criu_opts *opts)
char eth[128], *veth;
struct lxc_netdev *n = it->elem;
if (n->type != LXC_NET_VETH)
continue;
if (n->name) {
if (strlen(n->name) >= sizeof(eth))
goto err;
......@@ -304,7 +307,12 @@ bool criu_ok(struct lxc_container *c)
/* We only know how to restore containers with veth networks. */
lxc_list_for_each(it, &c->lxc_conf->network) {
struct lxc_netdev *n = it->elem;
if (n->type != LXC_NET_VETH && n->type != LXC_NET_NONE) {
switch(n->type) {
case LXC_NET_VETH:
case LXC_NET_NONE:
case LXC_NET_EMPTY:
break;
default:
ERROR("Found network that is not VETH or NONE\n");
return false;
}
......@@ -402,6 +410,10 @@ static bool restore_net_info(struct lxc_container *c)
lxc_list_for_each(it, &c->lxc_conf->network) {
struct lxc_netdev *netdev = it->elem;
char template[IFNAMSIZ];
if (netdev->type != LXC_NET_VETH)
continue;
snprintf(template, sizeof(template), "vethXXXXXX");
if (!netdev->priv.veth_attr.pair)
......
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