- detect libvirt flavor of LXC containers properly

Changed files:
    systemd.spec -> 1.85
    virt-libvirt.patch -> 1.1

diff --git a/systemd.spec b/systemd.spec
index 6da574c35a28c3da46d992c24d7031e12f3c57d0..74d1da2d5a3804a6208d5699467e8ee1b87917eb 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -11,7 +11,7 @@ Summary:      A System and Service Manager
 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
@@ -24,6 +24,7 @@ Source5:      network.service
 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}
@@ -189,6 +190,7 @@ Bashowe dopełnianie składni dla systemd
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build

diff --git a/virt-libvirt.patch b/virt-libvirt.patch
new file mode 100644 (file)
index 0000000..0a38361
--- /dev/null
+++ b/virt-libvirt.patch
@@ -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)