diff options
| author | Simon Schampijer <simon@schampijer.de> | 2011-11-28 09:02:31 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2011-11-29 18:38:00 (GMT) |
| commit | 1603c3480899f2c3e2970a9e7fcae8126f9ff161 (patch) | |
| tree | 81eee04ed486741abaf1edda535152125fd432be | |
| parent | 338ff0bc70be9305307995b4a2db37a243b89df4 (diff) | |
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>
| -rw-r--r-- | 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 MainToolbar from jarabe.controlpanel.toolbar import SectionToolbar from jarabe import config +POWERD_FLAG_DIR = '/etc/powerd/flags' _logger = logging.getLogger('ControlPanel') @@ -129,7 +130,7 @@ class ControlPanel(gtk.Window): 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: |