Quoting Stéphane Graber (stgra...@ubuntu.com):
> Introduce a new -F option (no-op for now) as an opposite of -d.
>
> Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com>
> ---
> doc/lxc-start.sgml.in | 14 ++++++++++++++
> src/lxc/lxc_start.c | 5 ++++-
> 2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
> index 07f9845..1bbe302 100644
> --- a/doc/lxc-start.sgml.in
> +++ b/doc/lxc-start.sgml.in
> @@ -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">-L <replaceable>console_logfile</replaceable></arg>
> <arg choice="opt">-d</arg>
> + <arg choice="opt">-F</arg>
> <arg choice="opt">-p <replaceable>pid_file</replaceable></arg>
> <arg choice="opt">-s KEY=VAL</arg>
> <arg choice="opt">-C</arg>
> @@ -107,6 +108,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
> Boston, MA 02110-1301 USA
>
> <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>
> + <term>
> <option>-p, --pidfile <replaceable>pid_file</replaceable></option>
> </term>
> <listitem>
> diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
> index 7924ab1..0e4874c 100644
> --- a/src/lxc/lxc_start.c
> +++ b/src/lxc/lxc_start.c
> @@ -147,6 +147,7 @@ static int my_parser(struct lxc_arguments* args, int c,
> char* arg)
> case 'c': args->console = arg; break;
> case 'L': args->console_log = arg; break;
> case 'd': args->daemonize = 1; break;
> + case 'F': args->daemonize = 0; break;
> case 'f': args->rcfile = arg; break;
> case 'C': args->close_all_fds = 1; break;
> 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[] = {
> {"daemon", no_argument, 0, 'd'},
> + {"foreground", no_argument, 0, 'F'},
> {"rcfile", required_argument, 0, 'f'},
> {"define", required_argument, 0, 's'},
> {"console", required_argument, 0, 'c'},
> @@ -181,7 +183,8 @@ lxc-start start COMMAND in specified container NAME\n\
> \n\
> Options :\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\
> -f, --rcfile=FILE Load configuration file FILE\n\
> -c, --console=FILE Use specified FILE for the container console\n\
> --
> 1.9.1
>
> _______________________________________________
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
