- fixed on the libvirt side

Changed files:
    systemd.spec -> 1.90
    virt-libvirt.patch -> 1.2

diff --git a/systemd.spec b/systemd.spec
index 7249ce9f968c58e33156f41f24c0ab139cee0176..1c423375d498a53d1047321608b93bdb73c3833b 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -24,8 +24,7 @@ Source5:      network.service
 Patch0:                target-pld.patch
 Patch1:                config-pld.patch
 Patch2:                shut-sysv-up.patch
-Patch3:                virt-libvirt.patch
-Patch4:                pld-sysv-network.patch
+Patch3:                pld-sysv-network.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -192,7 +191,6 @@ Bashowe dopełnianie składni dla systemd
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build

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