From 2e1f31c82a739e41f44da79e487266c726e42a49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 26 Jan 2012 18:35:06 +0000 Subject: [PATCH] - fixed on the libvirt side Changed files: systemd.spec -> 1.90 virt-libvirt.patch -> 1.2 --- systemd.spec | 4 +--- virt-libvirt.patch | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 virt-libvirt.patch diff --git a/systemd.spec b/systemd.spec index 7249ce9..1c42337 100644 --- 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 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) -- 2.44.0