hal: Branch 'master'

[Sjoerd Simons]

 tools/linux/hal-system-killswitch-get-power-linux |    8 +++-----
 tools/linux/hal-system-killswitch-set-power-linux |    8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit ac4c7790259136ca30d717631afebcd6a20add18
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sat Dec 8 19:30:00 2007 +0100

    always define DELL_WCTL
    
    This fixes errors from some shell when running the killswitch callouts
    because DEL_WCTL is undefined when the killswitch access method is not dell.

diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux
index c24253f..5a1fb3f 100755
--- a/tools/linux/hal-system-killswitch-get-power-linux
+++ b/tools/linux/hal-system-killswitch-get-power-linux
@@ -8,11 +8,9 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 
-if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-    DELL_WCTL=/usr/bin/dellWirelessCtl
-    if [ -x /usr/sbin/dellWirelessCtl ]; then
-        DELL_WCTL=/usr/sbin/dellWirelessCtl
-    fi
+DELL_WCTL=/usr/bin/dellWirelessCtl
+if [ -x /usr/sbin/dellWirelessCtl ]; then
+  DELL_WCTL=/usr/sbin/dellWirelessCtl
 fi
 
 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
index 2ef9ebe..4120c2d 100755
--- a/tools/linux/hal-system-killswitch-set-power-linux
+++ b/tools/linux/hal-system-killswitch-set-power-linux
@@ -8,11 +8,9 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 
-if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-    DELL_WCTL=/usr/bin/dellWirelessCtl
-    if [ -x /usr/sbin/dellWirelessCtl ]; then
-        DELL_WCTL=/usr/sbin/dellWirelessCtl
-    fi
+DELL_WCTL=/usr/bin/dellWirelessCtl
+if [ -x /usr/sbin/dellWirelessCtl ]; then
+    DELL_WCTL=/usr/sbin/dellWirelessCtl
 fi
 
 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then