From 8525c46929e88f3d677f4639be780cfbeb61a317 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jan 05 2016 15:54:52 +0000
Subject: new-release


  - plugin_cpu: do not show error if cpupower or x86_energy_perf_policy are missing
  - plugin_sysctl: fixed quoting of sysctl values
    resolves: rhbz#1254538
  - tuned-adm: added log file location hint to verify command output
  - libexec: fixed listdir and isdir in defirqaffinity.py
    resolves: rhbz#1252160
  - plugin_cpu: save and restore only intel pstate attributes that were changed
    resolves: rhbz#1252156
  - functions: fixed sysfs save to work with options
    resolves: rhbz#1251507
  - plugins: added scsi_host plugin
  - tuned-adm: fixed restart attempt if tuned is not running
  - spec: fixed post scriptlet to work without grub
    resolves: rhbz#1265654
  - tuned-profiles-nfv: fix find-lapictscdeadline-optimal.sh for CPUS where ns > 6500
    resolves: rhbz#1267284
  - functions: fixed restore_logs_syncing to preserve SELinux context on rsyslog.conf
    resolves: rhbz#1268901
  - realtime: set unboud workqueues cpumask
    resolves: rhbz#1259043
  - spec: correctly remove tuned footprint from /etc/default/grub
    resolves: rhbz#1268845
  - gui: fixed creation of new profile
    resolves: rhbz#1274609
  - profiles: removed nohz_full from the realtime profile
    resolves: rhbz#1274486
  - profiles: Added nohz_full and nohz=on to realtime guest/host profiles
    resolves: rhbz#1274445
  - profiles: fixed lapic_timer_adv_ns cache
    resolves: rhbz#1259452
  - plugin_sysctl: pass verification even if the option doesn't exist
    related: rhbz#1252153
  - added support for 'summary' and 'description' of profiles,
    extended D-Bus API for Cockpit
    related: rhbz#1228356

---

diff --git a/sources b/sources
index 80b919d..fd5748a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-814d558f038558e21d9e48c9cac989ae  tuned-2.5.1.tar.bz2
+2652f98589aa9fc79396c475bdc78ee3  tuned-2.6.0.tar.bz2
diff --git a/tuned.spec b/tuned.spec
index b915ead..7680ede 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 2.5.1
-Release: 2%{?dist}
+Version: 2.6.0
+Release: 1%{?dist}
 License: GPLv2+
 Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2
 URL: https://fedorahosted.org/tuned/
@@ -137,8 +137,10 @@ rmdir %{buildroot}%{_sysconfdir}/grub.d
 sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' /etc/tuned/active_profile
 
 # convert GRUB_CMDLINE_LINUX to GRUB_CMDLINE_LINUX_DEFAULT
-sed -i 's/GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX \\$tuned_params"/GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT \\$tuned_params"/' \
-  %{_sysconfdir}/default/grub
+if [ -r "%{_sysconfdir}/default/grub" ]; then
+  sed -i 's/GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX \\$tuned_params"/GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT \\$tuned_params"/' \
+    %{_sysconfdir}/default/grub
+fi
 
 
 %preun
@@ -153,7 +155,9 @@ sed -i 's/GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX \\$tuned_params"/GRUB_CMDLINE_
 if [ "$1" == 0 ]; then
   rm -f %{_sysconfdir}/grub.d/00_tuned || :
 # unpatch /etc/default/grub
-  sed -i '/GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT \\$tuned_params"/d' %{_sysconfdir}/default/grub
+  if [ -r "%{_sysconfdir}/default/grub" ]; then
+    sed -i '/GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT:+$GRUB_CMDLINE_LINUX_DEFAULT }\\$tuned_params"/d' %{_sysconfdir}/default/grub
+  fi
 fi
 
 
@@ -290,6 +294,44 @@ fi
 %{_mandir}/man7/tuned-profiles-compat.7*
 
 %changelog
+* Tue Jan  5 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.6.0-1
+- new-release
+  - plugin_cpu: do not show error if cpupower or x86_energy_perf_policy are missing
+  - plugin_sysctl: fixed quoting of sysctl values
+    resolves: rhbz#1254538
+  - tuned-adm: added log file location hint to verify command output
+  - libexec: fixed listdir and isdir in defirqaffinity.py
+    resolves: rhbz#1252160
+  - plugin_cpu: save and restore only intel pstate attributes that were changed
+    resolves: rhbz#1252156
+  - functions: fixed sysfs save to work with options
+    resolves: rhbz#1251507
+  - plugins: added scsi_host plugin
+  - tuned-adm: fixed restart attempt if tuned is not running
+  - spec: fixed post scriptlet to work without grub
+    resolves: rhbz#1265654
+  - tuned-profiles-nfv: fix find-lapictscdeadline-optimal.sh for CPUS where ns > 6500
+    resolves: rhbz#1267284
+  - functions: fixed restore_logs_syncing to preserve SELinux context on rsyslog.conf
+    resolves: rhbz#1268901
+  - realtime: set unboud workqueues cpumask
+    resolves: rhbz#1259043
+  - spec: correctly remove tuned footprint from /etc/default/grub
+    resolves: rhbz#1268845
+  - gui: fixed creation of new profile
+    resolves: rhbz#1274609
+  - profiles: removed nohz_full from the realtime profile
+    resolves: rhbz#1274486
+  - profiles: Added nohz_full and nohz=on to realtime guest/host profiles
+    resolves: rhbz#1274445
+  - profiles: fixed lapic_timer_adv_ns cache
+    resolves: rhbz#1259452
+  - plugin_sysctl: pass verification even if the option doesn't exist
+    related: rhbz#1252153
+  - added support for 'summary' and 'description' of profiles,
+    extended D-Bus API for Cockpit
+    related: rhbz#1228356
+
 * Wed Aug 12 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.1-2
 - packaging fixes for rpm-4.12.90
 - dropped qemu-kvm-tools-rhev requirement (not in Fedora)