From 17992e6924d3cef9d0995b7835d702b4ca6b52e1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 24 Jun 2019 14:26:52 +0800 Subject: [PATCH 2/2] do not load the system-wide Xresources - In https://github.com/rhinstaller/anaconda, revert the following commit: ----------------------------------------------- commit ef85e16c80609efc6bdd50c3a5aa6333fcdf0a57 Author: David Shea Date: Wed Mar 9 14:43:03 2016 -0500 Load the system-wide Xresources (#1241724) ----------------------------------------------- The reason is OE does not have spice-vdagent. - Use terminal vt7 to display X Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia --- pyanaconda/display.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/display.py b/pyanaconda/display.py index 2258f23..7d48d58 100644 --- a/pyanaconda/display.py +++ b/pyanaconda/display.py @@ -137,7 +137,7 @@ def start_x11(xtimeout): # Start Xorg and wait for it become ready util.startX(["Xorg", "-br", "-logfile", "/tmp/X.log", - ":%s" % constants.X_DISPLAY_NUMBER, "vt6", "-s", "1440", "-ac", + ":%s" % constants.X_DISPLAY_NUMBER, "vt7", "-s", "1440", "-ac", "-nolisten", "tcp", "-dpi", "96", "-noreset"], output_redirect=subprocess.DEVNULL, timeout=xtimeout) @@ -328,8 +328,8 @@ def setup_display(anaconda, options): anaconda.gui_startup_failed = True time.sleep(2) - if not anaconda.gui_startup_failed: - do_extra_x11_actions(options.runres, gui_mode=anaconda.gui_mode) + #if not anaconda.gui_startup_failed: + # do_extra_x11_actions(options.runres, gui_mode=anaconda.gui_mode) if anaconda.tui_mode and anaconda.gui_startup_failed and flags.vncquestion and not anaconda.ksdata.vnc.enabled: message = _("X was unable to start on your machine. Would you like to start VNC to connect to " -- 2.7.4