[libvirt] [PATCH] lxc: export container=lxc-libvirt for systemd

[Daniel P. Berrange]

On Tue, Jan 24, 2012 at 11:53:38AM -0700, Eric Blake wrote:
> Systemd detects containers based on whether they have
> an environment variable starting with 'container=lxc';
> using a longer name fits the expectations, while also
> allowing detection of who created the container.
> 
> Requested by Lennart Poettering, in response to
> https://bugs.freedesktop.org/show_bug.cgi?id=45175
> 
> * src/lxc/lxc_container.c (lxcContainerBuildInitCmd): Add another
> env-var.
> ---
>  src/lxc/lxc_container.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index c1ec9c4..70f6908 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (C) 2008-2011 Red Hat, Inc.
> + * Copyright (C) 2008-2012 Red Hat, Inc.
>   * Copyright (C) 2008 IBM Corp.
>   *
>   * lxc_container.c: file description
> @@ -124,6 +124,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef)
> 
>      virCommandAddEnvString(cmd, "PATH=/bin:/sbin");
>      virCommandAddEnvString(cmd, "TERM=linux");
> +    virCommandAddEnvString(cmd, "container=lxc-libvirt");
>      virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr);
>      virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name);
>      if (vmDef->os.cmdline)

ACK, I had actually offered to do this before, but at the time
it was though having LIBVIRT_LXC_UUID was fine. Oh well.


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|