config: remove deprecated config options

diff --git a/config.cc b/config.cc
index 309e1a775b2a3c4be8c34e2d652ba9ace89626d5..f9ca8670093aa2f77b35509830cd34af707bdec8 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -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();

diff --git a/config.proto b/config.proto
index 2a4a009b21c79735412ab3165ce398f499659800..d468a8f5fde77b12acca4a985b90ca71d7faa4a9 100644 (file)
--- a/config.proto
+++ b/config.proto
@@ -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 */