proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 05:26:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc: add --define to start

Browse Source 
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Cedric Le Goater 2010-01-14 07:43:18 +01:00 committed by Daniel Lezcano
parent a31b2048d9
commit 33ba4ad795
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/lxc-start.sgml.in
View File

@ -49,7 +49,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis><command>lxc-start <replaceable>-n <cmdsynopsis><command>lxc-start <replaceable>-n
name</replaceable> <optional>-f name</replaceable> <optional>-f
config_file</optional> <optional>command</optional></command></cmdsynopsis> config_file</optional> <optional>-s KEY=VAL</optional>
<optional>command</optional></command></cmdsynopsis>
</refsynopsisdiv> </refsynopsisdiv>
<refsect1> <refsect1>
@ -105,6 +106,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<option>-s <replaceable>KEY=VAL</replaceable></option>
</term>
<listitem>
<para>
Assign value <replaceable>VAL</replaceable> to configuration
variable <replaceable>KEY</replaceable>. This overrides any
assignment done in <replaceable>config_file</replaceable>.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>

12
src/lxc/lxc_start.c
View File

@ -50,11 +50,14 @@
lxc_log_define(lxc_start_ui, lxc_start); lxc_log_define(lxc_start_ui, lxc_start);
static struct lxc_list defines;
static int my_parser(struct lxc_arguments* args, int c, char* arg) static int my_parser(struct lxc_arguments* args, int c, char* arg)
{ {
switch (c) { switch (c) {
case 'd': args->daemonize = 1; break; case 'd': args->daemonize = 1; break;
case 'f': args->rcfile = arg; break; case 'f': args->rcfile = arg; break;
case 's': return lxc_config_define_add(&defines, arg);
} }
return 0; return 0;
} }
@ -62,6 +65,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
static const struct option my_longopts[] = { static const struct option my_longopts[] = {
{"daemon", no_argument, 0, 'd'}, {"daemon", no_argument, 0, 'd'},
{"rcfile", required_argument, 0, 'f'}, {"rcfile", required_argument, 0, 'f'},
{"define", required_argument, 0, 's'},
LXC_COMMON_OPTIONS LXC_COMMON_OPTIONS
}; };
@ -75,7 +79,8 @@ lxc-start start COMMAND in specified container NAME\n\
Options :\n\ Options :\n\
-n, --name=NAME NAME for name of the container\n\ -n, --name=NAME NAME for name of the container\n\
-d, --daemon daemonize the container\n\ -d, --daemon daemonize the container\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, .options = my_longopts,
.parser = my_parser, .parser = my_parser,
.checker = NULL, .checker = NULL,
@ -135,6 +140,8 @@ int main(int argc, char *argv[])
char *rcfile = NULL; char *rcfile = NULL;
struct lxc_conf *conf; struct lxc_conf *conf;
lxc_list_init(&defines);
if (lxc_arguments_parse(&my_args, argc, argv)) if (lxc_arguments_parse(&my_args, argc, argv))
return err; return err;
@ -174,6 +181,9 @@ int main(int argc, char *argv[])
return err; return err;
} }
if (lxc_config_define_load(&defines, conf))
return err;
if (!rcfile && !strcmp("/sbin/init", args[0])) { if (!rcfile && !strcmp("/sbin/init", args[0])) {
ERROR("no configuration file for '/sbin/init' (may crash the host)"); ERROR("no configuration file for '/sbin/init' (may crash the host)");
return err; return err;