From: Robert Swiecki <robert@swiecki.net>
Date: Thu, 9 Jul 2020 15:28:56 +0000 (+0200)
Subject: config: remove deprecated config options
X-Git-Tag: 3.0~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2d5b07c76b3fa79cc9894def4e2676a016bad2c;p=platform%2Fupstream%2Fnsjail.git

config: remove deprecated config options
---

diff --git a/config.cc b/config.cc
index 309e1a7..f9ca867 100644
--- 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 2a4a009..d468a8f 100644
--- 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 */