diff options
author | netblue30 <netblue30@yahoo.com> | 2015-12-21 12:30:57 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2015-12-21 12:30:57 -0500 |
commit | 074667ce4e81c1e83b5741ac3baa043390a5ff4d (patch) | |
tree | 1f15159153265d6353d3593cbd75e1fdde48e149 | |
parent | Merge branch 'master' of https://github.com/netblue30/firejail (diff) | |
download | firejail-074667ce4e81c1e83b5741ac3baa043390a5ff4d.tar.gz firejail-074667ce4e81c1e83b5741ac3baa043390a5ff4d.tar.zst firejail-074667ce4e81c1e83b5741ac3baa043390a5ff4d.zip |
fixes
-rw-r--r-- | src/firejail/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 3a06ec0f1..f672c32d9 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -1221,6 +1221,10 @@ int main(int argc, char **argv) { | |||
1221 | // check network configuration options - it will exit if anything went wrong | 1221 | // check network configuration options - it will exit if anything went wrong |
1222 | net_check_cfg(); | 1222 | net_check_cfg(); |
1223 | 1223 | ||
1224 | // check trace configuration | ||
1225 | if (arg_trace && arg_tracelog) | ||
1226 | fprintf(stderr, "Warning: --trace and --tracelog are mutually exclusive; --tracelog disabled\n"); | ||
1227 | |||
1224 | // check user namespace (--noroot) options | 1228 | // check user namespace (--noroot) options |
1225 | if (arg_noroot) { | 1229 | if (arg_noroot) { |
1226 | if (arg_overlay) { | 1230 | if (arg_overlay) { |