proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-14 13:38:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc-start: Add -F (foreground) option

Browse Source 
Introduce a new -F option (no-op for now) as an opposite of -d.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2014-07-21 11:50:49 +02:00
parent b1814e1c69
commit 476d302ca2
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<arg choice="opt">-c <replaceable>console_device</replaceable></arg> <arg choice="opt">-c <replaceable>console_device</replaceable></arg>
<arg choice="opt">-L <replaceable>console_logfile</replaceable></arg> <arg choice="opt">-L <replaceable>console_logfile</replaceable></arg>
<arg choice="opt">-d</arg> <arg choice="opt">-d</arg>
<arg choice="opt">-F</arg>
<arg choice="opt">-p <replaceable>pid_file</replaceable></arg> <arg choice="opt">-p <replaceable>pid_file</replaceable></arg>
<arg choice="opt">-s KEY=VAL</arg> <arg choice="opt">-s KEY=VAL</arg>
<arg choice="opt">-C</arg> <arg choice="opt">-C</arg>
@ -105,6 +106,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<option>-F, --foreground</option>
</term>
<listitem>
<para>
Run the container in the foreground. In this mode, the container
console will be attached to the current tty and signals will be routed
directly to the container. (This is the default mode)
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
<option>-p, --pidfile <replaceable>pid_file</replaceable></option> <option>-p, --pidfile <replaceable>pid_file</replaceable></option>

5
src/lxc/lxc_start.c
View File

@ -147,6 +147,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
case 'c': args->console = arg; break; case 'c': args->console = arg; break;
case 'L': args->console_log = arg; break; case 'L': args->console_log = arg; break;
case 'd': args->daemonize = 1; break; case 'd': args->daemonize = 1; break;
case 'F': args->daemonize = 0; break;
case 'f': args->rcfile = arg; break; case 'f': args->rcfile = arg; break;
case 'C': args->close_all_fds = 1; break; case 'C': args->close_all_fds = 1; break;
case 's': return lxc_config_define_add(&defines, arg); case 's': return lxc_config_define_add(&defines, arg);
@ -160,6 +161,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'},
{"foreground", no_argument, 0, 'F'},
{"rcfile", required_argument, 0, 'f'}, {"rcfile", required_argument, 0, 'f'},
{"define", required_argument, 0, 's'}, {"define", required_argument, 0, 's'},
{"console", required_argument, 0, 'c'}, {"console", required_argument, 0, 'c'},
@ -181,7 +183,8 @@ lxc-start start COMMAND in specified container NAME\n\
\n\ \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, --foreground Start with the current tty attached to /dev/console (default)\n\
-p, --pidfile=FILE Create a file with the process id\n\ -p, --pidfile=FILE Create a file with the process id\n\
-f, --rcfile=FILE Load configuration file FILE\n\ -f, --rcfile=FILE Load configuration file FILE\n\
-c, --console=FILE Use specified FILE for the container console\n\ -c, --console=FILE Use specified FILE for the container console\n\