hal: Branch 'master'

[David Zeuthen]

 tools/linux/hal-system-power-hibernate-linux |    9 +++++++++
 tools/linux/hal-system-power-suspend-linux   |   15 +++++++++++++++
 2 files changed, 24 insertions(+)

New commits:
diff-tree ff1246c473d915310fb218b1ee8914be5da742fb (from 9512652670bbb48a4b5c64547047617296e57d19)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed Aug 2 18:44:32 2006 -0400

    add support for Mandriva's tools for suspend and hibernate

diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
index c6abdb3..91da280 100755
--- a/tools/linux/hal-system-power-hibernate-linux
+++ b/tools/linux/hal-system-power-hibernate-linux
@@ -19,6 +19,15 @@ if [ -f /etc/altlinux-release ] || [ -f 
 		unsupported
 	fi
 
+#Mandriva support suspend-scripts 
+elif [ -f /etc/mandriva-release ] ; then 
+    if [ -x /usr/sbin/pmsuspend ] ; then 
+	/usr/sbin/pmsuspend disk 
+	RET=$? 
+    else 
+	unsupported 
+    fi 
+
 #RedHat/Fedora only support pm-utils
 elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] ; then
 	if [ -x /usr/sbin/pm-hibernate ] ; then
diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
index 867bd72..59cde73 100755
--- a/tools/linux/hal-system-power-suspend-linux
+++ b/tools/linux/hal-system-power-suspend-linux
@@ -38,6 +38,21 @@ if [ -f "/etc/altlinux-release" ] || [ -
 		unsupported
 	fi
 
+#Mandriva supports suspend-scripts 
+elif [ -f "/etc/mandriva-release" ] ; then 
+    # TODO: fix pmsuspend to take a --wakeup-alarm argument 
+    if [ $seconds_to_sleep != "0" ] ; then 
+	alarm_not_supported 
+    fi 
+    
+    if [ -x "/usr/sbin/pmsuspend" ] ; then 
+	/usr/sbin/pmsuspend memory
+	RET=$? 
+    else 
+        # TODO: add support 
+	unsupported 
+    fi 
+
 #RedHat/Fedora only support pm-utils
 elif [ -f "/etc/redhat-release" ] || [ -f "/etc/fedora-release" ] ; then
 	# TODO: fix pm-suspend to take a --wakeup-alarm argument