Re: [libvirt] [PATCH v2] Set the 'container_ttys' env variable for LXC consoles

On 12/17/2013 03:04 AM, Daniel P. Berrange wrote: > From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; > > Systemd specified that any /dev/pts/NNN device on which it > is expected to spawn a agetty login, should be listed in > the 'container_ttys' env variable. It should just contain > the relative paths, eg 'pts/0' not '/dev/pts/0' and should > be space separated. > > http://cgit.freedesktop.org/systemd/systemd/commit/?id=1d97ff7dd71902a560... > > In v2: > - Rewrite loop with virBufferTrim > - Don't include first pty in env > - Only set env if at least one pty is listed > > Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; > --- > src/lxc/lxc_container.c | 32 ++++++++++++++++++++++++++++++-- > 1 file changed, 30 insertions(+), 2 deletions(-) > > diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c > index 51fa1b3..c885782 100644 > --- a/src/lxc/lxc_container.c > +++ b/src/lxc/lxc_container.c > @@ -196,10 +196,33 @@ int lxcContainerHasReboot(void) > * > * Returns a virCommandPtr > */ > -static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) > +static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, > + char **ttyPaths, > + size_t nttyPaths) > { > char uuidstr[VIR_UUID_STRING_BUFLEN]; > virCommandPtr cmd; > + virBuffer buf = VIR_BUFFER_INITIALIZER; > + size_t i; > + > + /* 'container_ptys' must exclude the PTY associated with > + * the /dev/console device, hence start at 1 not 0 > + */ > + for (i = 1; i < nttyPaths; i++) { > + if (!STRPREFIX(ttyPaths[0], "/dev/")) { So the ttyPaths[0] is right here??