4fe94b
From 284041dc14f21cd343fed4297cd67ff540d22511 Mon Sep 17 00:00:00 2001
4fe94b
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
4fe94b
Date: Thu, 6 Mar 2014 17:22:09 +0100
4fe94b
Subject: [PATCH] systemd: added cpupower.service conflict
4fe94b
MIME-Version: 1.0
4fe94b
Content-Type: text/plain; charset=UTF-8
4fe94b
Content-Transfer-Encoding: 8bit
4fe94b
4fe94b
Resolves: rhbz#1073392
4fe94b
4fe94b
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
4fe94b
---
4fe94b
 tuned.service | 1 +
4fe94b
 1 file changed, 1 insertion(+)
4fe94b
4fe94b
diff --git a/tuned.service b/tuned.service
4fe94b
index e205730..d2d5d83 100644
4fe94b
--- a/tuned.service
4fe94b
+++ b/tuned.service
4fe94b
@@ -1,6 +1,7 @@
4fe94b
 [Unit]
4fe94b
 Description=Dynamic System Tuning Daemon
4fe94b
 After=syslog.target
4fe94b
+Conflicts=cpupower.service
4fe94b
 
4fe94b
 [Service]
4fe94b
 Type=dbus
4fe94b
-- 
4fe94b
1.8.5.3
4fe94b