From: Michel Normand <normand@fr.ibm.com>
Date: Thu, 21 Jan 2010 13:34:08 +0000 (+0100)
Subject: add --define to restart V2
X-Git-Tag: lxc-0.6.5~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4357db9a063bd5df3570a1b9ce957253a9d68d40;p=thirdparty%2Flxc.git

add --define to restart V2

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_restart.c b/src/lxc/lxc_restart.c
index cfadd05be..7db1d85da 100644
--- a/src/lxc/lxc_restart.c
+++ b/src/lxc/lxc_restart.c
@@ -37,6 +37,8 @@
 
 lxc_log_define(lxc_restart_ui, lxc_restart);
 
+static struct lxc_list defines;
+
 static int my_checker(const struct lxc_arguments* args)
 {
 	if (!args->statefile) {
@@ -53,6 +55,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
 	case 'd': args->statefile = arg; break;
 	case 'f': args->rcfile = arg; break;
 	case 'p': args->flags = LXC_FLAG_PAUSE; break;
+	case 's': return lxc_config_define_add(&defines, arg);
 	}
 
 	return 0;
@@ -62,6 +65,7 @@ static const struct option my_longopts[] = {
 	{"directory", required_argument, 0, 'd'},
 	{"rcfile", required_argument, 0, 'f'},
 	{"pause", no_argument, 0, 'p'},
+	{"define", required_argument, 0, 's'},
 	LXC_COMMON_OPTIONS
 };
 
@@ -76,7 +80,8 @@ Options :\n\
   -n, --name=NAME      NAME for name of the container\n\
   -p, --pause          do not release the container after the restart\n\
   -d, --directory=STATEFILE for name of statefile\n\
-  -f, --rcfile=FILE Load configuration file FILE\n",
+  -f, --rcfile=FILE Load configuration file FILE\n\
+  -s, --define KEY=VAL Assign VAL to configuration variable KEY\n",
 	.options  = my_longopts,
 	.parser   = my_parser,
 	.checker  = my_checker,
@@ -87,6 +92,8 @@ int main(int argc, char *argv[])
 	char *rcfile = NULL;
 	struct lxc_conf *conf;
 
+	lxc_list_init(&defines);
+
 	if (lxc_arguments_parse(&my_args, argc, argv))
 		return -1;
 
@@ -121,6 +128,9 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
+	if (lxc_config_define_load(&defines, conf))
+		return -1;
+
 	return lxc_restart(my_args.name, my_args.statefile, conf,
 			   my_args.flags);
 }