diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in index 07f9845b8..1bbe30234 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 -c console_device -L console_logfile -d + -F -p pid_file -s KEY=VAL -C @@ -105,6 +106,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + + + + + 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) + + + + diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c index 7924ab1ab..0e4874c45 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\