From 64d13663f16d18c58da08fd8ae14e4b8fe06f910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Fri, 22 Jun 2018 16:29:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD=20?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82=D0=BC=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=83=D1=89=D0=B5=D0=B3=D0=BE=20=D1=80=D0=B0=D0=B7=D1=80=D0=B5?=
 =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20X?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/install/variables/X11.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pym/install/variables/X11.py b/pym/install/variables/X11.py
index 259cdea..e2ceed4 100644
--- a/pym/install/variables/X11.py
+++ b/pym/install/variables/X11.py
@@ -133,16 +133,27 @@ class VariableOsInstallX11Resolution(ResolutionVariable):
     X.org resolution
     """
     fallback_resolution = "1024x768"
+    FBIOGET_VSCREENINFO = 0x4600
+
+    def framebuffer_resolution(self):
+        try:
+            fbdev = os.open('/dev/fb0', os.O_RDONLY)
+            data = fcntl.ioctl(fbdev, self.FBIOGET_VSCREENINFO, " " * 8)
+            res = struct.unpack("II", data)
+            return "%sx%s" % (res[0], res[1])
+        except (IOError, OSError):
+            pass
+        return ""
 
     def get(self):
         # get resolution from xorg.log
-        for vn in ('install.os_install_x11_resolution_preferred',
-                   'install.os_install_fb_resolution'):
-            res = self.Get(vn)
-            if res:
-                return res
-        else:
-            return self.fallback_resolution
+        res = self.Get('install.os_install_x11_resolution_preferred')
+        if res:
+            return res
+        res = self.framebuffer_resolution()
+        if res:
+            return res
+        return self.fallback_resolution
 
 class VariableOsInstallX11VideoAvailable(VideoVariable):
     """