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

[Gao feng]

On 12/14/2013 12:52 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange at redhat.com>
> 
> 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.

Just FYI systemd will skrip off /dev,so /dev/pts/0 is ok too.
> 
> http://cgit.freedesktop.org/systemd/systemd/commit/?id=1d97ff7dd71902a5604c2fed8964925d54e09de9
> 
> Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
> ---
>  src/lxc/lxc_container.c | 28 ++++++++++++++++++++++++++--
>  1 file changed, 26 insertions(+), 2 deletions(-)
> 
> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index 51fa1b3..f0b526f 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -196,10 +196,30 @@ 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;
> +
> +    for (i = 0 ; i < nttyPaths ; i++) {
> +        if (!STRPREFIX(ttyPaths[0], "/dev/")) {
			  ^^^^^^^^^^
			  ttyPaths[i]

> +            virReportError(VIR_ERR_INTERNAL_ERROR,
> +                           _("Expected a /dev path for '%s'"),
> +                           ttyPaths[0]);
> +            virBufferFreeAndReset(&buf);
> +            return NULL;
> +        }
> +        if (i)
> +            virBufferAddLit(&buf, " ");
> +        virBufferAdd(&buf, ttyPaths[i] + 5, -1);

had better to make sure there is no /dev//pts/x case.

> +    }
> +
> +    if (virBufferError(&buf))
> +        return NULL;
>  
>      virUUIDFormat(vmDef->uuid, uuidstr);
>  
> @@ -214,9 +234,11 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef)
>      virCommandAddEnvPair(cmd, "container_uuid", uuidstr);
>      virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr);
>      virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name);
> +    virCommandAddEnvPair(cmd, "container_ttys", virBufferCurrentContent(&buf));
>      if (vmDef->os.cmdline)
>          virCommandAddEnvPair(cmd, "LIBVIRT_LXC_CMDLINE", vmDef->os.cmdline);
>  
> +    virBufferFreeAndReset(&buf);
>      return cmd;
>  }
>  
> @@ -1789,7 +1811,9 @@ static int lxcContainerChild(void *data)
>      if ((hasReboot = lxcContainerHasReboot()) < 0)
>          goto cleanup;
>  
> -    cmd = lxcContainerBuildInitCmd(vmDef);
> +    cmd = lxcContainerBuildInitCmd(vmDef,
> +                                   argv->ttyPaths,
> +                                   argv->nttyPaths);
>      virCommandWriteArgLog(cmd, 1);
>  
>      if (lxcContainerSetID(vmDef) < 0)
> 

ACK