diff options
Diffstat (limited to 'config.cc')
| -rw-r--r-- | config.cc | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -251,6 +251,8 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig& nsjconf->nice_level = njc.nice_level(); nsjconf->cgroup_mem_max = njc.cgroup_mem_max(); + nsjconf->cgroup_mem_memsw_max = njc.cgroup_mem_memsw_max(); + nsjconf->cgroup_mem_swap_max = njc.cgroup_mem_swap_max(); nsjconf->cgroup_mem_mount = njc.cgroup_mem_mount(); nsjconf->cgroup_mem_parent = njc.cgroup_mem_parent(); nsjconf->cgroup_pids_max = njc.cgroup_pids_max(); @@ -278,6 +280,8 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig& nsjconf->iface_vs_ma = njc.macvlan_vs_ma(); nsjconf->iface_vs_mo = njc.macvlan_vs_mo(); + nsjconf->disable_tsc = njc.disable_tsc(); + if (njc.has_exec_bin()) { if (njc.exec_bin().has_path()) { nsjconf->exec_file = njc.exec_bin().path(); @@ -322,11 +326,11 @@ bool parseFile(nsjconf_t* nsjconf, const char* file) { return false; } if (!configParseInternal(nsjconf, nsc)) { - LOG_W("Couldn't parse the ProtoBuf"); + LOG_W("Couldn't parse the ProtoBuf from '%s'", file); return false; } - LOG_D("Parsed config:\n'%s'", nsc.DebugString().c_str()); + LOG_D("Parsed config from '%s':\n'%s'", file, nsc.DebugString().c_str()); return true; } |