mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-04 21:09:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1783 from brauner/2017-09-04/criu_version

Browse Source 
criu: add cmp_version()
This commit is contained in:
Stéphane Graber
2017-09-04 15:52:44 -04:00
committed by GitHub
parent 56c2d600a8 74ad36079c
commit a753a7a931
1 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/lxc/criu.c
View File

@@ -126,6 +126,47 @@ static int load_tty_major_minor(char *directory, char *output, int len)
return 0; return 0;
} }
static int cmp_version(const char *v1, const char *v2)
{
int ret;
int oct_v1[3], oct_v2[3];
memset(oct_v1, -1, sizeof(oct_v1));
memset(oct_v2, -1, sizeof(oct_v2));
ret = sscanf(v1, "%d.%d.%d", &oct_v1[0], &oct_v1[1], &oct_v1[2]);
if (ret < 1)
return -1;
ret = sscanf(v2, "%d.%d.%d", &oct_v2[0], &oct_v2[1], &oct_v2[2]);
if (ret < 1)
return -1;
/* Major version is greater. */
if (oct_v1[0] > oct_v2[0])
return 1;
if (oct_v1[0] < oct_v2[0])
return -1;
/* Minor number is greater.*/
if (oct_v1[1] > oct_v2[1])
return 1;
if (oct_v1[1] < oct_v2[1])
return -1;
/* Patch number is greater. */
if (oct_v1[2] > oct_v2[2])
return 1;
/* Patch numbers are equal. */
if (oct_v1[2] == oct_v2[2])
return 0;
return -1;
}
static void exec_criu(struct criu_opts *opts) static void exec_criu(struct criu_opts *opts)
{ {
char **argv, log[PATH_MAX]; char **argv, log[PATH_MAX];
@@ -500,7 +541,7 @@ static void exec_criu(struct criu_opts *opts)
struct lxc_netdev *n = it->elem; struct lxc_netdev *n = it->elem;
bool external_not_veth; bool external_not_veth;
if (strcmp(opts->criu_version, CRIU_EXTERNAL_NOT_VETH) >= 0) { if (cmp_version(opts->criu_version, CRIU_EXTERNAL_NOT_VETH) >= 0) {
/* Since criu version 2.8 the usage of --veth-pair /* Since criu version 2.8 the usage of --veth-pair
* has been deprecated: * has been deprecated:
* git tag --contains f2037e6d3445fc400 * git tag --contains f2037e6d3445fc400