aboutsummaryrefslogtreecommitdiffstats
path: root/executor
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-04-06 17:25:54 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-04-06 17:28:33 +0200
commit8e4c2e24cb05daf27a600b570d3a774083a1210b (patch)
tree6e0be187becc43fa25fd801220e4d9ccef086342 /executor
parent7606c2ac04a132ddb6ff46df1477b6e6d56750bd (diff)
executor: create team device
Diffstat (limited to 'executor')
-rw-r--r--executor/common_linux.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h
index cb1d79c88..08b6a2038 100644
--- a/executor/common_linux.h
+++ b/executor/common_linux.h
@@ -298,11 +298,13 @@ static void execute_command(bool panic, const char* format, ...)
// Set own standard PATH to make it work across distributions.
memcpy(command, PATH_PREFIX, PATH_PREFIX_LEN);
vsnprintf_check(command + PATH_PREFIX_LEN, COMMAND_MAX_LEN, format, args);
- rv = system(command);
- if (panic && rv != 0)
- fail("tun: command \"%s\" failed with code %d", &command[0], rv);
-
va_end(args);
+ rv = system(command);
+ if (rv) {
+ if (panic)
+ fail("command '%s' failed: %d", &command[0], rv);
+ debug("command '%s': %d\n", &command[0], rv);
+ }
}
static int tunfd = -1;
@@ -402,11 +404,11 @@ static void initialize_tun(void)
static void initialize_netdevices(void)
{
unsigned i;
- const char* devtypes[] = {"ip6gretap", "bridge", "vcan", "bond", "veth"};
+ const char* devtypes[] = {"ip6gretap", "bridge", "vcan", "bond", "veth", "team"};
const char* devnames[] = {"lo", "sit0", "bridge0", "vcan0", "tunl0",
"gre0", "gretap0", "ip_vti0", "ip6_vti0",
"ip6tnl0", "ip6gre0", "ip6gretap0",
- "erspan0", "bond0", "veth0", "veth1"};
+ "erspan0", "bond0", "veth0", "veth1", "team0"};
#ifdef SYZ_EXECUTOR
if (!flag_enable_tun)