Skip to content

Commit

Permalink
Drop xrdb
Browse files Browse the repository at this point in the history
It wasn't used and it won't work on Wayland.

Resolves: RHEL-38399
  • Loading branch information
jexposit authored and M4rtinK committed May 27, 2024
1 parent a85523f commit 2f19d60
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion anaconda.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,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
Expand Down
9 changes: 0 additions & 9 deletions pyanaconda/display.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 2f19d60

Please sign in to comment.