rpms/pm-utils/devel pm-utils-1.1.0-default-to-shutdown.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 pm-utils.spec, 1.98, 1.99

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20328

Modified Files:
	.cvsignore pm-utils.spec 
Added Files:
	pm-utils-1.1.0-default-to-shutdown.patch 
Log Message:
* Fri Apr 18 2008 Peter Jones <pjones at redhat.com> - 1.1.0-7
- Default to "shutdown" for hibernate unless it's unavailable.


pm-utils-1.1.0-default-to-shutdown.patch:

--- NEW FILE pm-utils-1.1.0-default-to-shutdown.patch ---
diff -up pm-utils-1.1.0/pm/defaults.shutdown pm-utils-1.1.0/pm/defaults
--- pm-utils-1.1.0/pm/defaults.shutdown	2008-04-18 17:12:11.000000000 -0400
+++ pm-utils-1.1.0/pm/defaults	2008-04-18 17:12:29.000000000 -0400
@@ -10,7 +10,7 @@
 #
 # Check /sys/power/disk for valid values.  The default value
 # will be surrounded by [square brackets].
-# HIBERNATE_MODE="shutdown"
+HIBERNATE_MODE="shutdown"
 
 # Whether we need to post the video card when resuming from
 # hibernate. You should not normally need to set this.  
diff -up pm-utils-1.1.0/pm/module.d/kernel.shutdown pm-utils-1.1.0/pm/module.d/kernel
--- pm-utils-1.1.0/pm/module.d/kernel.shutdown	2008-04-18 17:12:42.000000000 -0400
+++ pm-utils-1.1.0/pm/module.d/kernel	2008-04-18 17:15:29.000000000 -0400
@@ -20,10 +20,16 @@ check_hibernate()
 	[ -f /sys/power/disk ] && grep -q disk /sys/power/state
 }
 
+check_hibernate_mode()
+{
+	[ -n "$HIBERNATE_MODE" ] || return 1
+	grep -q "$HIBERNATE_MODE" /sys/power/disk && return 0
+	return 1
+}
+
 do_hibernate()
 {
-	[ "$HIBERNATE_MODE" ] && \
-		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
+	check_hibernate_mode && echo -n "${HIBERNATE_MODE}" > /sys/power/disk
 	echo -n "disk" > /sys/power/state
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	8 Apr 2008 14:19:21 -0000	1.28
+++ .cvsignore	18 Apr 2008 21:21:00 -0000	1.29
@@ -1 +1,2 @@
+clog
 pm-utils-1.1.0.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- pm-utils.spec	15 Apr 2008 21:25:48 -0000	1.98
+++ pm-utils.spec	18 Apr 2008 21:21:00 -0000	1.99
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 Requires: usermode kbd pciutils >= 2.2.1
@@ -31,6 +31,7 @@
 Source23: pm-utils-bugreport-info.sh
 
 Patch0: pm-utils-1.1.0-log_order.patch
+Patch1: pm-utils-1.1.0-default-to-shutdown.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,6 +54,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .log_order
+%patch1 -p1
 
 
 %build
@@ -156,6 +158,9 @@
 %{_libdir}/pkgconfig/pm-utils.pc
 
 %changelog
+* Fri Apr 18 2008 Peter Jones <pjones at redhat.com> - 1.1.0-7
+- Default to "shutdown" for hibernate unless it's unavailable.
+
 * Tue Apr 15 2008 Jesse Keating <jkeating at redhat.com> - 1.1.0-6
 - Don't error on post restorecon call (which can fail if selinux is disabled)