From 30cc02d159fc44801f3bb01099e8190f4004a2b1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2016 14:22:53 +0000
Subject: import tuned-2.5.1-4.el7_2.3


---

diff --git a/SOURCES/tuned-2.5.1-restart-attempt-fix.patch b/SOURCES/tuned-2.5.1-restart-attempt-fix.patch
new file mode 100644
index 0000000..586e874
--- /dev/null
+++ b/SOURCES/tuned-2.5.1-restart-attempt-fix.patch
@@ -0,0 +1,29 @@
+From 7b4596ba21893f12181630d73d6ec99f447104bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Mon, 31 Aug 2015 11:19:41 +0200
+Subject: [PATCH] tuned-adm: fixed restart attempt if tuned is not running
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+---
+ tuned/admin/admin.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tuned/admin/admin.py b/tuned/admin/admin.py
+index 4db24c4..1180785 100644
+--- a/tuned/admin/admin.py
++++ b/tuned/admin/admin.py
+@@ -77,7 +77,7 @@ class Admin(object):
+ 				if self._cmd.write_to_file(consts.ACTIVE_PROFILE_FILE, profile_name):
+ 					print "Trying to (re)start tuned..."
+ 					(ret, out) = self._cmd.execute(["service", "tuned", "restart"])
+-					if retcode == 0:
++					if ret == 0:
+ 						print "Tuned (re)started, changes applied."
+ 					else:
+ 						print "Tuned (re)start failed, you need to (re)start tuned by hand for changes to apply."
+-- 
+2.5.0
+
diff --git a/SPECS/tuned.spec b/SPECS/tuned.spec
index e5266ea..5b4ed8b 100644
--- a/SPECS/tuned.spec
+++ b/SPECS/tuned.spec
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 2.5.1
-Release: 4%{?dist}.2
+Release: 4%{?dist}.3
 License: GPLv2+
 Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2
 URL: https://fedorahosted.org/tuned/
@@ -28,6 +28,8 @@ Patch5: tuned-2.5.1-find-lapictscdeadline-optimal-fix.patch
 Patch6: tuned-2.5.1-realtime-remove-nohz-full.patch
 # rhbz#1298204
 Patch7: tuned-2.5.1-realtime-virtual-host-modprobe-race-fix.patch
+# rhbz#1305903
+Patch8: tuned-2.5.1-restart-attempt-fix.patch
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -135,6 +137,7 @@ It can be also used to fine tune your system for specific scenarios.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 
 %build
@@ -322,6 +325,10 @@ fi
 %{_mandir}/man7/tuned-profiles-compat.7*
 
 %changelog
+* Tue Feb  9 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.1-4.3
+- fixed traceback during restart attempt
+  resolves: rhbz#1305903
+
 * Wed Jan 13 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.1-4.2
 - fixed race in modprobe in realtime-virtual-host profile and extended
   stop action to have hint why it is called