proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 22:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2273 from aither64/master

Browse Source 
conf: fix net type checks in run_script_argv()
This commit is contained in:
Christian Brauner 2018-04-13 10:39:05 +02:00 committed by GitHub
commit bf5afb0174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/conf.c
View File

@ -440,7 +440,7 @@ int run_script_argv(const char *name, unsigned int hook_version,
parent = argv[1] ? argv[1] : ""; parent = argv[1] ? argv[1] : "";
if (strcmp(argv[0], "macvlan")) { if (strcmp(argv[0], "macvlan") == 0) {
ret = setenv("LXC_NET_PARENT", parent, 1); ret = setenv("LXC_NET_PARENT", parent, 1);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set environment " SYSERROR("Failed to set environment "
@ -448,7 +448,7 @@ int run_script_argv(const char *name, unsigned int hook_version,
goto on_error; goto on_error;
} }
TRACE("Set environment variable: LXC_NET_PARENT=%s", parent); TRACE("Set environment variable: LXC_NET_PARENT=%s", parent);
} else if (strcmp(argv[0], "phys")) { } else if (strcmp(argv[0], "phys") == 0) {
ret = setenv("LXC_NET_PARENT", parent, 1); ret = setenv("LXC_NET_PARENT", parent, 1);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set environment " SYSERROR("Failed to set environment "
@ -456,7 +456,7 @@ int run_script_argv(const char *name, unsigned int hook_version,
goto on_error; goto on_error;
} }
TRACE("Set environment variable: LXC_NET_PARENT=%s", parent); TRACE("Set environment variable: LXC_NET_PARENT=%s", parent);
} else if (strcmp(argv[0], "veth")) { } else if (strcmp(argv[0], "veth") == 0) {
char *peer = argv[2] ? argv[2] : ""; char *peer = argv[2] ? argv[2] : "";
ret = setenv("LXC_NET_PEER", peer, 1); ret = setenv("LXC_NET_PEER", peer, 1);