cli: Remove the --namespace option

Submitted by Pavel Emelianov on May 13, 2016, 2:12 p.m.

Details

Message ID 5735E0D4.4020606@virtuozzo.com
State Rejected
Series "cli: Remove the --namespace option"
Headers show

Commit Message

Pavel Emelianov May 13, 2016, 2:12 p.m.
This thing was used in the ancient days when we didn't have /proc/pid/ns files
as links. The only used of it (images w/o the ids.img file) has been already
removed in 2.1, so probably it's time to drop the option itself.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/crtools.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/crtools.c b/criu/crtools.c
index ec7cc53..9cf9d49 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -257,7 +257,7 @@  int main(int argc, char *argv[], char *envp[])
 	int log_level = LOG_UNSET;
 	char *imgs_dir = ".";
 	char *work_dir = NULL;
-	static const char short_opts[] = "dSsRf:F:t:p:hcD:o:n:v::x::Vr:jJ:lW:L:M:";
+	static const char short_opts[] = "dSsRf:F:t:p:hcD:o:v::x::Vr:jJ:lW:L:M:";
 	static struct option long_opts[] = {
 		{ "tree",			required_argument,	0, 't'	},
 		{ "pid",			required_argument,	0, 'p'	},
@@ -272,7 +272,6 @@  int main(int argc, char *argv[], char *envp[])
 		{ "images-dir",			required_argument,	0, 'D'	},
 		{ "work-dir",			required_argument,	0, 'W'	},
 		{ "log-file",			required_argument,	0, 'o'	},
-		{ "namespaces",			required_argument,	0, 'n'	},
 		{ "join-ns",			required_argument,	0, 'J'	},
 		{ "root",			required_argument,	0, 'r'	},
 		{ USK_EXT_PARAM,		optional_argument,	0, 'x'	},
@@ -407,9 +406,6 @@  int main(int argc, char *argv[], char *envp[])
 		case 'o':
 			opts.output = optarg;
 			break;
-		case 'n':
-			pr_warn("The -n|--namespaces option has no effect and will soon be removed.\n");
-			break;
 		case 'J':
 			if (parse_join_ns(optarg))
 				goto bad_arg;