[meta-anaconda,1/2] python3-anaconda: Fix xserver detection

Submitted by Ovidiu Panait on May 9, 2019, 12:53 p.m. | Patch ID: 161092

Details

Message ID 20190509125341.11345-1-ovidiu.panait@windriver.com
State New
Headers show

Commit Message

Ovidiu Panait May 9, 2019, 12:53 p.m.
When installing an image that has graphical interface,
/etc/systemd/system/default.target will point to multi-user.target
instead of graphical.target.

To fix this, use the right rpm query to detect the presence of xserver.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 ...aconda-payload-Fix-xserver-detection.patch | 35 +++++++++++++++++++
 .../anaconda/python3-anaconda_28.22.11.bb     |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 recipes-installer/anaconda/files/0001-pyanaconda-payload-Fix-xserver-detection.patch

Patch hide | download patch | download mbox

diff --git a/recipes-installer/anaconda/files/0001-pyanaconda-payload-Fix-xserver-detection.patch b/recipes-installer/anaconda/files/0001-pyanaconda-payload-Fix-xserver-detection.patch
new file mode 100644
index 0000000..ae56019
--- /dev/null
+++ b/recipes-installer/anaconda/files/0001-pyanaconda-payload-Fix-xserver-detection.patch
@@ -0,0 +1,35 @@ 
+From f35925543f8b19c7b39cef4679cc0bc74bfa5253 Mon Sep 17 00:00:00 2001
+From: Ovidiu Panait <ovidiu.panait@windriver.com>
+Date: Thu, 9 May 2019 09:04:44 +0000
+Subject: [PATCH] pyanaconda: payload: Fix xserver detection
+
+When installing an image that has graphical interface,
+/etc/systemd/system/default.target will point to multi-user.target
+instead of graphical.target.
+
+To fix this, use the right rpm query to detect the presence of xserver.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
+---
+ pyanaconda/payload/__init__.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pyanaconda/payload/__init__.py b/pyanaconda/payload/__init__.py
+index f67a4cd94..7929407e7 100644
+--- a/pyanaconda/payload/__init__.py
++++ b/pyanaconda/payload/__init__.py
+@@ -897,8 +897,7 @@ class Payload(object):
+             ts = rpm.TransactionSet(util.getSysroot())
+ 
+             # XXX one day this might need to account for anaconda's display mode
+-            if ts.dbMatch("provides", 'service(graphical-login)').count() and \
+-               ts.dbMatch('provides', 'xorg-x11-server-Xorg').count() and \
++            if ts.dbMatch('provides', 'xserver-xorg').count() and \
+                not flags.usevnc:
+                 # We only manipulate the ksdata.  The symlink is made later
+                 # during the config write out.
+-- 
+2.18.1
+
diff --git a/recipes-installer/anaconda/python3-anaconda_28.22.11.bb b/recipes-installer/anaconda/python3-anaconda_28.22.11.bb
index 66bbc1c..5deeae4 100755
--- a/recipes-installer/anaconda/python3-anaconda_28.22.11.bb
+++ b/recipes-installer/anaconda/python3-anaconda_28.22.11.bb
@@ -119,6 +119,7 @@  SRC_URI = "git://github.com/rhinstaller/anaconda;protocol=https;branch=f28-relea
            file://0001-Make-pyanaconda.dbus.typing-work-with-Python-3.7-159.patch \
            file://0068-disable-chronyd.patch \
            file://0069-disable-location-detection-based-on-IP-address.patch \
+           file://0001-pyanaconda-payload-Fix-xserver-detection.patch \
           "
 
 SRCREV = "0b0d2f86b4323e6ee7a186bc8181ffe7553c9235"