- rel 3

- add patch to make systemd in lxc happy

Changed files:
    libvirt-lxc-systemd.patch -> 1.1
    libvirt.spec -> 1.54

diff --git a/libvirt-lxc-systemd.patch b/libvirt-lxc-systemd.patch
new file mode 100644 (file)
index 0000000..309e5a0
--- /dev/null
+++ b/libvirt-lxc-systemd.patch
@@ -0,0 +1,38 @@
+From: Eric Blake <eblake@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)

diff --git a/libvirt.spec b/libvirt.spec
index 4aab47f32cca17b1fdb9e714a3cf9280d7369bdc..e41e999db9a1088d64567fa505171862521243fb 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -28,7 +28,7 @@ Summary:      Toolkit to interact with virtualization capabilities
 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
@@ -37,6 +37,7 @@ Source1:      %{name}.init
 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
@@ -245,6 +246,7 @@ Zarządca blokad sanlock dla biblioteki libvirt.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # weird translations
 %{__rm} po/{my,eu_ES}.{po,gmo}