c/r: don't require a veth link to c/r

veths can be unconnected in the container's config, and we should handle this case. Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

c/r: don't require a veth link to c/r
ad60725e · Tycho Andersen · Stéphane Graber · eac6837f · ad60725e
Commit ad60725e authored Nov 06, 2015 by Tycho Andersen Committed by Stéphane Graber Nov 06, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

criu.c src/lxc/criu.c +4 -1

No files found.
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -178,7 +178,10 @@ void exec_criu(struct criu_opts *opts)

 			veth = n->priv.veth_attr.pair;

-			ret = snprintf(buf, sizeof(buf), "%s=%s@%s", eth, veth, n->link);
+			if (n->link)
+				ret = snprintf(buf, sizeof(buf), "%s=%s@%s", eth, veth, n->link);
+			else
+				ret = snprintf(buf, sizeof(buf), "%s=%s", eth, veth);
 			if (ret < 0 || ret >= sizeof(buf))
 				goto err;