config: remove deprecated config options

This commit is contained in:
Robert Swiecki
2020-07-09 17:28:56 +02:00
parent 6482720b29
commit a2d5b07c76
2 changed files with 0 additions and 8 deletions

View File

@@ -82,10 +82,6 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig&
LOG_E("Unknown running mode: %d", njc.mode());
return false;
}
if (njc.has_chroot_dir()) {
nsjconf->chroot = njc.chroot_dir();
}
nsjconf->is_root_rw = njc.is_root_rw();
nsjconf->hostname = njc.hostname();
nsjconf->cwd = njc.cwd();
nsjconf->port = njc.port();

View File

@@ -81,10 +81,6 @@ message NsJailConfig {
/* Execution mode: see 'msg Mode' description for more */
optional Mode mode = 3 [default = ONCE];
/* Equivalent to a bind mount with dst='/'. DEPRECATED: Use bind mounts. */
optional string chroot_dir = 4 [deprecated = true];
/* Applies both to the chroot_dir and to /proc mounts. DEPRECATED: Use bind mounts */
optional bool is_root_rw = 5 [default = false, deprecated = true];
/* Hostname inside jail */
optional string hostname = 8 [default = "NSJAIL"];
/* Initial current working directory for the binary */