From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Wed, 12 Oct 2016 22:46:09 +0000 (+0000)
Subject: c/r: use --external instead of --veth-pair
X-Git-Tag: lxc-2.1.0~290^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f90d613ab0d473731e6207a651685467f30c817;p=thirdparty%2Flxc.git

c/r: use --external instead of --veth-pair

--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>
---

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index f22873643..0b5fc0915 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -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);
 		}