From 616b7e2c259666b6c49c862ffb480e1d4e7fdb51 Mon Sep 17 00:00:00 2001 From: Petr Holasek Date: Tue, 25 Jun 2013 13:53:35 +0200 Subject: [PATCH] Revert "Resolves: bz975474" This reverts commit 74f7ffdf9857890a928628ea9a1bb85f19d9abe4. --- irqbalance-1.0.6-no-virt-service.patch | 11 ----------- irqbalance.spec | 7 +------ 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 irqbalance-1.0.6-no-virt-service.patch diff --git a/irqbalance-1.0.6-no-virt-service.patch b/irqbalance-1.0.6-no-virt-service.patch deleted file mode 100644 index 551e151..0000000 --- a/irqbalance-1.0.6-no-virt-service.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up irqbalance-1.0.6/misc/irqbalance.service.orig irqbalance-1.0.6/misc/irqbalance.service ---- irqbalance-1.0.6/misc/irqbalance.service.orig 2013-06-19 16:51:49.586832569 +0200 -+++ irqbalance-1.0.6/misc/irqbalance.service 2013-06-19 16:52:02.385833438 +0200 -@@ -1,6 +1,7 @@ - [Unit] - Description=irqbalance daemon - After=syslog.target -+ConditionVirtualization=no - - [Service] - EnvironmentFile=/etc/sysconfig/irqbalance diff --git a/irqbalance.spec b/irqbalance.spec index 7150f33..635bb5a 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -1,6 +1,6 @@ Name: irqbalance Version: 1.0.6 -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 Summary: IRQ balancing daemon @@ -25,7 +25,6 @@ Requires(preun):systemd-units ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} Patch1: irqbalance-1.0.4-env-file-path.patch -Patch2: irqbalance-1.0.6-no-virt-service.patch %description irqbalance is a daemon that evenly distributes IRQ load across @@ -34,7 +33,6 @@ multiple CPUs for enhanced performance. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build %{configure} @@ -72,9 +70,6 @@ fi /sbin/chkconfig --del irqbalance >/dev/null 2>&1 || : %changelog -* Wed Jun 19 2013 Petr Holasek - 2:1.0.6-2 -- Block irqbalance from running in virt environments (bz975474) - * Mon Jun 10 2013 Petr Holasek - 2:1.0.6-1 - Rebased to version 1.0.6