Quoting Stéphane Graber (stgra...@ubuntu.com): > Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com> Should a note be added to Changelog? Or do we leave this up to package maintainers to mention in release notes (since noone is gonna read the currently empty Changelog)? > --- > doc/lxc-start.sgml.in | 4 ++-- > src/lxc/lxc_start.c | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in > index 1bbe302..950cc24 100644 > --- a/doc/lxc-start.sgml.in > +++ b/doc/lxc-start.sgml.in > @@ -101,7 +101,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA 02110-1301 USA > <para> > Run the container as a daemon. As the container has no > more tty, if an error occurs nothing will be displayed, > - the log file can be used to check the error. > + the log file can be used to check the error. (This is the default > mode) > </para> > </listitem> > </varlistentry> > @@ -114,7 +114,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA 02110-1301 USA > <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) > + directly to the container. > </para> > </listitem> > </varlistentry> > diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c > index 0e4874c..8623578 100644 > --- a/src/lxc/lxc_start.c > +++ b/src/lxc/lxc_start.c > @@ -183,8 +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\ > - -F, --foreground Start with the current tty attached to /dev/console > (default)\n\ > + -d, --daemon Daemonize the container (default)\n\ > + -F, --foreground Start with the current tty attached to > /dev/console\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\ > @@ -198,7 +198,7 @@ Options :\n\ > .options = my_longopts, > .parser = my_parser, > .checker = NULL, > - .daemonize = 0, > + .daemonize = 1, > .pidfile = NULL, > }; > > -- > 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
