hal: Branch 'master'

[Danny Kukawka]

 tools/linux/hal-system-power-suspend-hybrid-linux |    4 +---
 tools/linux/hal-system-power-suspend-linux        |    6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit f36161b859cf6c606f256c7e399b992b6ae360f2
Author: Gabriel Burt <gburt at suse.de>
Date:   Tue Sep 30 16:54:48 2008 +0200

    export seconds_to_sleep to pm-utils
    
    Put the seconds_to_sleep variable into an environment variable so
    pm-utils can act on it.

diff --git a/tools/linux/hal-system-power-suspend-hybrid-linux b/tools/linux/hal-system-power-suspend-hybrid-linux
index dc149f8..ee0030f 100755
--- a/tools/linux/hal-system-power-suspend-hybrid-linux
+++ b/tools/linux/hal-system-power-suspend-hybrid-linux
@@ -32,9 +32,7 @@ QUIRKS=""
 
 # We only support pm-utils
 if [ -x "/usr/sbin/pm-suspend-hybrid" ] ; then
-    if [ $seconds_to_sleep != "0" ] ; then
-	alarm_not_supported
-    fi
+    export NUM_SECONDS_TO_SLEEP=$seconds_to_sleep
     /usr/sbin/pm-suspend-hybrid $QUIRKS
     RET=$?
 else
diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
index 76c5800..48ff1f5 100755
--- a/tools/linux/hal-system-power-suspend-linux
+++ b/tools/linux/hal-system-power-suspend-linux
@@ -31,13 +31,9 @@ QUIRKS=""
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_SAVE_PCI" = "true" ] && QUIRKS="$QUIRKS --quirk-save-pci"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_NONE" = "true" ] && QUIRKS="$QUIRKS --quirk-none"
 
-# Urh. Do any BIOSen handle this correctly?
-if [ $seconds_to_sleep != "0" ] ; then
-	alarm_not_supported
-fi
-
 # We only support pm-utils
 if [ -x "/usr/sbin/pm-suspend" ] ; then
+	export NUM_SECONDS_TO_SLEEP=$seconds_to_sleep
 	/usr/sbin/pm-suspend $QUIRKS
 	RET=$?
 else