blob: 23a6f9e8ca8e20e48192eaeafaa14f39091b44ce (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From ab59f75d4e6e7a95975a9311344f5a4f2120cd1c Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Mon, 28 Nov 2011 10:02:31 +0100
Subject: [PATCH sugar 13/74] Control Panel, Power section: check if powerd is
available OLPC #11437
Recent versions of the kernel export the Open Firmware device tree to
user space as /proc/device-tree, rather than /ofw (the latter was
specific to OLPC kernels). We checked for existence of /ofw to determine
whether we're running on an OLPC XO and assumed it's running
olpc-powerd, since that is what we actually try to control. By checking
for a directory created by olpc-powerd, we make sure that it's actually
available (to us) and works on any kernel version.
Check if powerd is available to determine if the power section
is displayed or not.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
---
src/jarabe/controlpanel/gui.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 2f55951..46810aa 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -30,6 +30,7 @@
from jarabe.controlpanel.toolbar import SectionToolbar
from jarabe import config
+POWERD_FLAG_DIR = '/etc/powerd/flags'
_logger = logging.getLogger('ControlPanel')
@@ -129,7 +130,7 @@ def _setup_main(self):
self.__search_changed_cb)
def _setup_options(self):
- if not os.path.exists('/ofw'):
+ if not os.access(POWERD_FLAG_DIR, os.W_OK):
del self._options['power']
try:
--
1.7.6
|
