diff options
| author | Simon Schampijer <simon@schampijer.de> | 2011-08-18 11:10:19 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2011-08-18 12:40:02 (GMT) |
| commit | b454c1253d95fc62c0cdf9ce34c40397a3c6f49e (patch) | |
| tree | 8e6ec1cdc9c3d0dbab03fd5acf8b7c16a1f47614 /extensions | |
| parent | ef01c0d8e582eae0cd1c1550a9585138b0a6b457 (diff) | |
Add support for XO 1.75
The hardware specific information has been moved from '/ofw' to
'/proc/device-tree'. This has an effect on the Control Panel
where we display the serial number and the firmware number.
Furthermore the registration code needs to be aware of the possible
new place in order to send the serial number and UUID during
authentication.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Gonzalo Odiard <gonzalo@laptop.org>
Tested-by: Gonzalo Odiard <gonzalo@laptop.org>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/cpsection/aboutcomputer/model.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py index 3219dd1..a02eee6 100644 --- a/extensions/cpsection/aboutcomputer/model.py +++ b/extensions/cpsection/aboutcomputer/model.py @@ -33,6 +33,11 @@ _NM_IFACE = 'org.freedesktop.NetworkManager' _NM_DEVICE_IFACE = 'org.freedesktop.NetworkManager.Device' _NM_DEVICE_TYPE_WIFI = 2 +_OFW_TREE = '/ofw' +_PROC_TREE = '/proc/device-tree' +_SN = 'serial-number' +_MODEL = 'openprom/model' + _logger = logging.getLogger('ControlPanel - AboutComputer') _not_available = _('Not available') @@ -48,7 +53,11 @@ def print_aboutcomputer(): def get_serial_number(): - serial_no = _read_file('/ofw/serial-number') + serial_no = None + if os.path.exists(os.path.join(_OFW_TREE, _SN)): + serial_no = _read_file(os.path.join(_OFW_TREE, _SN)) + elif os.path.exists(os.path.join(_PROC_TREE, _SN)): + serial_no = _read_file(os.path.join(_PROC_TREE, _SN)) if serial_no is None: serial_no = _not_available return serial_no @@ -88,7 +97,11 @@ def print_build_number(): def get_firmware_number(): - firmware_no = _read_file('/ofw/openprom/model') + firmware_no = None + if os.path.exists(os.path.join(_OFW_TREE, _MODEL)): + firmware_no = _read_file(os.path.join(_OFW_TREE, _MODEL)) + elif os.path.exists(os.path.join(_PROC_TREE, _MODEL)): + firmware_no = _read_file(os.path.join(_PROC_TREE, _MODEL)) if firmware_no is None: firmware_no = _not_available else: |