Annotation of /trunk/hal/patches/hal-0.5.10-always-define-DELL_WCTL.patch
Parent Directory | Revision Log
Revision 597 -
(hide annotations)
(download)
Mon May 19 19:05:19 2008 UTC (16 years, 4 months ago) by niro
File size: 2069 byte(s)
Mon May 19 19:05:19 2008 UTC (16 years, 4 months ago) by niro
File size: 2069 byte(s)
-gentoo patches
1 | niro | 597 | From 6c24981f97d7779ea3cbcdbb3b76db7a8240eda9 Mon Sep 17 00:00:00 2001 |
2 | From: Sjoerd Simons <sjoerd@luon.net> | ||
3 | Date: Sat, 8 Dec 2007 19:30:00 +0100 | ||
4 | Subject: [PATCH] always define DELL_WCTL | ||
5 | |||
6 | This fixes errors from some shell when running the killswitch callouts | ||
7 | because DEL_WCTL is undefined when the killswitch access method is not dell. | ||
8 | --- | ||
9 | tools/linux/hal-system-killswitch-get-power-linux | 8 +++----- | ||
10 | tools/linux/hal-system-killswitch-set-power-linux | 8 +++----- | ||
11 | 2 files changed, 6 insertions(+), 10 deletions(-) | ||
12 | |||
13 | diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux | ||
14 | index c24253f..5a1fb3f 100755 | ||
15 | --- a/tools/linux/hal-system-killswitch-get-power-linux | ||
16 | +++ b/tools/linux/hal-system-killswitch-get-power-linux | ||
17 | @@ -8,11 +8,9 @@ | ||
18 | # the Free Software Foundation; either version 2 of the License, or | ||
19 | # (at your option) any later version. | ||
20 | |||
21 | -if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then | ||
22 | - DELL_WCTL=/usr/bin/dellWirelessCtl | ||
23 | - if [ -x /usr/sbin/dellWirelessCtl ]; then | ||
24 | - DELL_WCTL=/usr/sbin/dellWirelessCtl | ||
25 | - fi | ||
26 | +DELL_WCTL=/usr/bin/dellWirelessCtl | ||
27 | +if [ -x /usr/sbin/dellWirelessCtl ]; then | ||
28 | + DELL_WCTL=/usr/sbin/dellWirelessCtl | ||
29 | fi | ||
30 | |||
31 | if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then | ||
32 | diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux | ||
33 | index 2ef9ebe..4120c2d 100755 | ||
34 | --- a/tools/linux/hal-system-killswitch-set-power-linux | ||
35 | +++ b/tools/linux/hal-system-killswitch-set-power-linux | ||
36 | @@ -8,11 +8,9 @@ | ||
37 | # the Free Software Foundation; either version 2 of the License, or | ||
38 | # (at your option) any later version. | ||
39 | |||
40 | -if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then | ||
41 | - DELL_WCTL=/usr/bin/dellWirelessCtl | ||
42 | - if [ -x /usr/sbin/dellWirelessCtl ]; then | ||
43 | - DELL_WCTL=/usr/sbin/dellWirelessCtl | ||
44 | - fi | ||
45 | +DELL_WCTL=/usr/bin/dellWirelessCtl | ||
46 | +if [ -x /usr/sbin/dellWirelessCtl ]; then | ||
47 | + DELL_WCTL=/usr/sbin/dellWirelessCtl | ||
48 | fi | ||
49 | |||
50 | if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then | ||
51 | -- | ||
52 | 1.5.3.7 | ||
53 |