packages: libvirt/libvirt.spec, libvirt/libvirt-lxc-systemd.patch (NEW) - r...

[baggins]

Author: baggins                      Date: Thu Jan 26 18:27:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- add patch to make systemd in lxc happy

---- Files affected:
packages/libvirt:
   libvirt.spec (1.53 -> 1.54) , libvirt-lxc-systemd.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libvirt/libvirt.spec
diff -u packages/libvirt/libvirt.spec:1.53 packages/libvirt/libvirt.spec:1.54
--- packages/libvirt/libvirt.spec:1.53	Tue Jan 24 14:09:37 2012
+++ packages/libvirt/libvirt.spec	Thu Jan 26 19:27:44 2012
@@ -29,7 +29,7 @@
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
 Version:	0.9.9
-Release:	2
+Release:	3
 License:	LGPL v2.1+
 Group:		Base/Kernel
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
@@ -38,6 +38,7 @@
 Patch0:		%{name}-sasl.patch
 Patch1:		%{name}-scsi-git.patch
 Patch2:		%{name}-lxc.patch
+Patch3:		%{name}-lxc-systemd.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	audit-libs-devel
 BuildRequires:	augeas-devel
@@ -246,6 +247,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # weird translations
 %{__rm} po/{my,eu_ES}.{po,gmo}
@@ -449,6 +451,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2012/01/26 18:27:44  baggins
+- rel 3
+- add patch to make systemd in lxc happy
+
 Revision 1.53  2012/01/24 13:09:37  baggins
 - hack lxc driver to send -INT to init when 'shutdown' command is issued from host
 

================================================================
Index: packages/libvirt/libvirt-lxc-systemd.patch
diff -u /dev/null packages/libvirt/libvirt-lxc-systemd.patch:1.1
--- /dev/null	Thu Jan 26 19:27:49 2012
+++ packages/libvirt/libvirt-lxc-systemd.patch	Thu Jan 26 19:27:44 2012
@@ -0,0 +1,38 @@
+From: Eric Blake <eblake at redhat.com>
+Date: Tue, 24 Jan 2012 18:51:01 +0000 (-0700)
+Subject: lxc: export container=lxc-libvirt for systemd
+X-Git-Url: http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=16dc4ade7a2c83f166c7e8b8560a5fd42e662b53
+
+lxc: export container=lxc-libvirt for systemd
+
+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.
+---
+
+diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
+index dcd65ef..6eb188d 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
+@@ -119,6 +119,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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvirt/libvirt.spec?r1=1.53&r2=1.54&f=u