hal: Branch 'master'

[David Zeuthen]

 tools/linux/Makefile.am                           |    2 ++
 tools/linux/hal-system-power-hibernate-linux      |    3 ---
 tools/linux/hal-system-power-reboot-linux         |    3 ---
 tools/linux/hal-system-power-shutdown-linux       |    3 ---
 tools/linux/hal-system-power-suspend-hybrid-linux |    3 ---
 tools/linux/hal-system-power-suspend-linux        |    3 ---
 6 files changed, 2 insertions(+), 15 deletions(-)

New commits:
diff-tree f01bae02d42385e8e5e43c9ddbecb43f1518404d (from 9893a20754f96c0091f6db169398ebcda7e82e07)
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Apr 6 16:36:55 2007 -0400

    remote safety valves used in development

diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
index cd1fb80..6736c00 100644
--- a/tools/linux/Makefile.am
+++ b/tools/linux/Makefile.am
@@ -37,3 +37,5 @@ check:
             fi; \
         done;
 
+clean-local :
+	rm -f *~
diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
index 101a301..250e191 100755
--- a/tools/linux/hal-system-power-hibernate-linux
+++ b/tools/linux/hal-system-power-hibernate-linux
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-echo "safety valve; exiting here... TODO: remove me"
-exit 0
-
 POWERSAVED_SUSPEND2DISK="dbus-send --system --dest=com.novell.powersave \
                          --print-reply /com/novell/powersave \
                          com.novell.powersave.action.SuspendToDisk"
diff --git a/tools/linux/hal-system-power-reboot-linux b/tools/linux/hal-system-power-reboot-linux
index 79725cd..5c1d93d 100755
--- a/tools/linux/hal-system-power-reboot-linux
+++ b/tools/linux/hal-system-power-reboot-linux
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-echo "safety valve; exiting here... TODO: remove me"
-exit 0
-
 unsupported() {
 	echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2
 	echo "No reboot command found" >&2
diff --git a/tools/linux/hal-system-power-shutdown-linux b/tools/linux/hal-system-power-shutdown-linux
index aa77a1d..6a9811e 100755
--- a/tools/linux/hal-system-power-shutdown-linux
+++ b/tools/linux/hal-system-power-shutdown-linux
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-echo "safety valve; exiting here... TODO: remove me"
-exit 0
-
 unsupported() {
 	echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2
 	echo "No shutdown command found" >&2
diff --git a/tools/linux/hal-system-power-suspend-hybrid-linux b/tools/linux/hal-system-power-suspend-hybrid-linux
index 3bd1f0c..fc80ad0 100755
--- a/tools/linux/hal-system-power-suspend-hybrid-linux
+++ b/tools/linux/hal-system-power-suspend-hybrid-linux
@@ -14,9 +14,6 @@ unsupported() {
 
 read seconds_to_sleep
 
-echo "safety valve; exiting here... TODO: remove me"
-exit 0
-
 if [ -x "/usr/sbin/pm-suspend-hybrid" ] ; then
     if [ $seconds_to_sleep != "0" ] ; then
 	alarm_not_supported
diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
index 9e3d2b3..3e472f7 100755
--- a/tools/linux/hal-system-power-suspend-linux
+++ b/tools/linux/hal-system-power-suspend-linux
@@ -18,9 +18,6 @@ unsupported() {
 
 read seconds_to_sleep
 
-echo "safety valve; exiting here... TODO: remove me"
-exit 0
-
 # Make a suitable command line argument so that the tools can do the correct
 # quirks for video resume.
 # Passing the quirks to the tool allows the tool to not depend on HAL for data.