[gnome-boxes] unattended-installer: Be less strict about driver arch
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] unattended-installer: Be less strict about driver arch
- Date: Thu, 24 Jan 2013 14:00:18 +0000 (UTC)
commit 11cfd62c0552aed8af6d109c58bfabb495fa9bfb
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Wed Jan 16 19:48:51 2013 +0200
unattended-installer: Be less strict about driver arch
This fixes the issue of "i386" drivers not being picked for "i686" OS.
https://bugzilla.gnome.org/show_bug.cgi?id=692246
src/unattended-installer.vala | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index 4c556b2..6ec1fb6 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -666,7 +666,13 @@ private class Boxes.UnattendedInstaller: InstallerMedia {
foreach (var d in os.get_device_drivers ().get_elements ()) {
var driver = d as DeviceDriver;
- if (driver.get_architecture () == os_media.architecture && driver.get_pre_installable ())
+ if (!driver.get_pre_installable ())
+ continue;
+
+ var compatibility = compare_cpu_architectures (os_media.architecture, driver.get_architecture ());
+ if (compatibility == CPUArchCompatibity.IDENTICAL || compatibility == CPUArchCompatibity.COMPATIBLE)
+ // We don't entertain compatiblity when word-size is different because 32-bit drivers
+ // are not guaranteed to work on 64-bit architectures in all OSs.
drivers.append (driver);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]