packages: systemd/systemd.spec, systemd/virt-libvirt.patch (NEW) - detect l...

[baggins]

Author: baggins                      Date: Sun Jan 22 23:51:19 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- detect libvirt flavor of LXC containers properly

---- Files affected:
packages/systemd:
   systemd.spec (1.84 -> 1.85) , virt-libvirt.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.84 packages/systemd/systemd.spec:1.85
--- packages/systemd/systemd.spec:1.84	Sun Jan 22 07:44:58 2012
+++ packages/systemd/systemd.spec	Mon Jan 23 00:51:14 2012
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 Version:	38
-Release:	7
+Release:	7.1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -25,6 +25,7 @@
 Patch0:		target-pld.patch
 Patch1:		config-pld.patch
 Patch2:		shut-sysv-up.patch
+Patch3:		virt-libvirt.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -190,6 +191,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -555,6 +557,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2012/01/22 23:51:14  baggins
+- detect libvirt flavor of LXC containers properly
+
 Revision 1.84  2012/01/22 06:44:58  cactus
 - rel 7
 

================================================================
Index: packages/systemd/virt-libvirt.patch
diff -u /dev/null packages/systemd/virt-libvirt.patch:1.1
--- /dev/null	Mon Jan 23 00:51:20 2012
+++ packages/systemd/virt-libvirt.patch	Mon Jan 23 00:51:14 2012
@@ -0,0 +1,14 @@
+--- systemd-38/src/virt.c~	2011-12-30 22:27:36.454528998 +0100
++++ systemd-38/src/virt.c	2012-01-23 00:41:53.036388492 +0100
+@@ -202,7 +202,10 @@
+                         }
+                         line[i] = 0;
+ 
+-                        if (streq(line, "container=lxc")) {
++                        if (streq(line, "container=lxc")
++			    || startswith(line, "LIBVIRT_LXC_UUID=")
++			    || startswith(line, "LIBVIRT_LXC_NAME=")
++			    || startswith(line, "LIBVIRT_LXC_CMDLINE=")) {
+                                 fclose(f);
+ 
+                                 if (id)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.84&r2=1.85&f=u