From ab0db663d096a4ffed327f01c235e54b0f83fffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Wed, 14 Feb 2024 15:59:47 +0100 Subject: [PATCH] Drop xrdb It wasn't used and it won't work on Wayland. --- anaconda.spec.in | 1 - pyanaconda/display.py | 9 --------- 2 files changed, 10 deletions(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index fcfe77c219b1..52e94f092270 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -247,7 +247,6 @@ Requires: createrepo_c # Display stuff moved from lorax templates Requires: xorg-x11-drivers Requires: xorg-x11-server-Xorg -Requires: xrdb Requires: dbus-x11 Requires: gsettings-desktop-schemas Requires: nm-connection-editor diff --git a/pyanaconda/display.py b/pyanaconda/display.py index 682043320c29..601558f5b0ff 100644 --- a/pyanaconda/display.py +++ b/pyanaconda/display.py @@ -232,13 +232,6 @@ def set_resolution(runres): log.error("The resolution was not set: %s", error) -def do_extra_x11_actions(): - """Perform X11 actions not related to startup.""" - # Load the system-wide Xresources - util.execWithRedirect("xrdb", ["-nocpp", "-merge", "/etc/X11/Xresources"]) - start_spice_vd_agent() - - def write_xdriver(driver, root=None): """Write the X driver.""" if root is None: @@ -384,8 +377,6 @@ def setup_display(anaconda, options): time.sleep(2) if not anaconda.gui_startup_failed: - do_extra_x11_actions() - if options.runres and anaconda.gui_mode and not flags.usevnc: def on_mutter_ready(observer): set_resolution(options.runres)