]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
c/r: use --external instead of --veth-pair
authorTycho Andersen <tycho.andersen@canonical.com>
Wed, 12 Oct 2016 22:46:09 +0000 (22:46 +0000)
committerTycho Andersen <tycho.andersen@canonical.com>
Mon, 24 Oct 2016 21:28:56 +0000 (21:28 +0000)
--veth-pair has been deprecated as of 2.6, let's use the new --external
instead.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
src/lxc/criu.c

index f228736437c540312eb3fa4864c091a12f1cde8e..0b5fc091515931d79899be4eaf2dbe3fec0ee56e 100644 (file)
@@ -452,13 +452,13 @@ static void exec_criu(struct criu_opts *opts)
                        veth = n->priv.veth_attr.pair;
 
                        if (n->link)
-                               ret = snprintf(buf, sizeof(buf), "%s=%s@%s", eth, veth, n->link);
+                               ret = snprintf(buf, sizeof(buf), "veth[%s]:%s@%s", eth, veth, n->link);
                        else
-                               ret = snprintf(buf, sizeof(buf), "%s=%s", eth, veth);
+                               ret = snprintf(buf, sizeof(buf), "veth[%s]:%s", eth, veth);
                        if (ret < 0 || ret >= sizeof(buf))
                                goto err;
 
-                       DECLARE_ARG("--veth-pair");
+                       DECLARE_ARG("--external");
                        DECLARE_ARG(buf);
                }