[pm-utils] Added support for in-kernel suspend to both (from kernel-3.6)

[Jaroslav Škarvada]

commit 2712ae13e66143994cd913cff6bd7467cd0d59f9
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Jul 27 09:19:31 2012 +0200

    Added support for in-kernel suspend to both (from kernel-3.6)
    
      Resolves: rhbz#843657

 pm-utils-1.4.1-add-in-kernel-suspend-to-both.patch |   24 ++++++++++++++++++++
 pm-utils.spec                                      |    9 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/pm-utils-1.4.1-add-in-kernel-suspend-to-both.patch b/pm-utils-1.4.1-add-in-kernel-suspend-to-both.patch
new file mode 100644
index 0000000..9cdd674
--- /dev/null
+++ b/pm-utils-1.4.1-add-in-kernel-suspend-to-both.patch
@@ -0,0 +1,24 @@
+diff --git a/pm/pm-functions.in b/pm/pm-functions.in
+--- a/pm/pm-functions.in
++++ b/pm/pm-functions.in
+@@ -317,6 +317,20 @@ if [ -z "$HIBERNATE_MODULE" ] && \
+ 	}
+ fi
+ 
++# for kernels that support suspend to both (i.e. hybrid suspend)
++# since kernel 3.6
++if [ -z "$SUSPEND_HYBRID_MODULE" ] && \
++	[ -f /sys/power/disk ] && \
++	grep -q disk /sys/power/state && \
++	grep -q suspend /sys/power/disk; then
++	SUSPEND_HYBRID_MODULE="kernel"
++	do_suspend_hybrid()
++	{
++		HIBERNATE_MODE="suspend"
++		do_hibernate
++	}
++fi
++
+ # since the kernel does not directly support hybrid sleep, we do
+ # something else -- suspend and schedule an alarm to go into
+ # hibernate if we have slept long enough.
diff --git a/pm-utils.spec b/pm-utils.spec
index 8e6852b..547063a 100644
--- a/pm-utils.spec
+++ b/pm-utils.spec
@@ -5,7 +5,7 @@ Name: pm-utils
 Summary: Power management utilities and scripts
 License: GPLv2
 Version: 1.4.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 %ifnarch s390 s390x
@@ -38,6 +38,8 @@ Patch3: pm-utils-1.4.1-hook-exit-code-log.patch
 Patch4: pm-utils-1.4.1-log-line-spacing-fix.patch
 # Fix NetworkManager dbus methods (fd.o #42500 / RH #740342)
 Patch5: pm-utils-1.4.1-nm_method.patch
+# Add support for in-kernel (from kernel 3.6) suspend to both (#843657)
+Patch6: pm-utils-1.4.1-add-in-kernel-suspend-to-both.patch
 
 %description
 The pm-utils package contains utilities and scripts useful for tasks related
@@ -63,6 +65,7 @@ tar -xzf %{SOURCE1}
 %patch3 -p1 -b .hook-exit-code-log
 %patch4 -p1 -b .log-line-spacing-fix
 %patch5 -p1 -b .nm_method
+%patch6 -p1 -b .add-in-kernel-suspend-to-both
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -126,6 +129,10 @@ rm -rf %{_localstatedir}/run/pm-utils/{pm-suspend,pm-powersave}/storage/*
 %{_libdir}/pkgconfig/pm-utils.pc
 
 %changelog
+* Fri Jul 27 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.4.1-21
+- Added support for in-kernel suspend to both (from kernel-3.6)
+  Resolves: rhbz#843657
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild