diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2015-03-23 07:06:02 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2015-04-02 23:28:55 +0000 |
| commit | 37b614abbfb35d06a57e5b0824249c3abd5640e3 (patch) | |
| tree | 35c11192c0a8408fee722f2ca067ac80c0ccd333 /src | |
| parent | f0751e67c2dac88948b1210548ef56d1e7c74750 (diff) | |
Re-order the uniqueDeviceId lookup order
* /etc/unique-id
* mac addresses
* /etc/machine-id
* /var/lib/dbus/machine-id
Change-Id: I4e0ee57f4b4f1557c27cba65fc46bf65f3973a9f
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/systeminfo/linux/qdeviceinfo_linux.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/systeminfo/linux/qdeviceinfo_linux.cpp b/src/systeminfo/linux/qdeviceinfo_linux.cpp index 19af87b4..c7ca57e8 100644 --- a/src/systeminfo/linux/qdeviceinfo_linux.cpp +++ b/src/systeminfo/linux/qdeviceinfo_linux.cpp @@ -389,6 +389,20 @@ QString QDeviceInfoPrivate::uniqueDeviceID() } } + if (uniqueDeviceIDBuffer.isEmpty()) { + QFile file(QStringLiteral("/etc/unique-id")); + if (file.open(QIODevice::ReadOnly)) { + QString id = QString::fromLocal8Bit(file.readAll().simplified().data()); + if (id.length() == 32) { + id = id.insert(8,'-').insert(13,'-').insert(18,'-').insert(23,'-'); + if (isUuid(id)) { + uniqueDeviceIDBuffer = id; + } + file.close(); + } + } + } + if (uniqueDeviceIDBuffer.isEmpty()) { //try wifi mac address QNetworkInfo netinfo; QString macaddy; @@ -404,21 +418,6 @@ QString QDeviceInfoPrivate::uniqueDeviceID() uniqueDeviceIDBuffer = id.toString(); } } - - if (uniqueDeviceIDBuffer.isEmpty()) { - QFile file(QStringLiteral("/var/lib/dbus/machine-id")); - - if (file.open(QIODevice::ReadOnly)) { - QString id = QString::fromLocal8Bit(file.readAll().simplified().data()); - if (id.length() == 32) { - id = id.insert(8,'-').insert(13,'-').insert(18,'-').insert(23,'-'); - if (isUuid(id)) { - uniqueDeviceIDBuffer = id; - } - } - file.close(); - } - } if (uniqueDeviceIDBuffer.isEmpty()) { QFile file(QStringLiteral("/etc/machine-id")); if (file.open(QIODevice::ReadOnly)) { @@ -432,9 +431,11 @@ QString QDeviceInfoPrivate::uniqueDeviceID() file.close(); } } - //last ditch effort + +//last ditch effort if (uniqueDeviceIDBuffer.isEmpty()) { - QFile file(QStringLiteral("/etc/unique-id")); + QFile file(QStringLiteral("/var/lib/dbus/machine-id")); + if (file.open(QIODevice::ReadOnly)) { QString id = QString::fromLocal8Bit(file.readAll().simplified().data()); if (id.length() == 32) { @@ -442,10 +443,12 @@ QString QDeviceInfoPrivate::uniqueDeviceID() if (isUuid(id)) { uniqueDeviceIDBuffer = id; } - file.close(); } + file.close(); } } + + return uniqueDeviceIDBuffer; } |