Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RHEL-10: Backport localed patchset #6000

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion anaconda.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ BuildRequires: desktop-file-utils
Requires: anaconda-gui = %{version}-%{release}
Requires: usermode
Requires: zenity
Requires: xisxwayland
Recommends: xhost

%description live
Expand Down
16 changes: 16 additions & 0 deletions docs/release-notes/rdp-support.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
:Type: GUI
:Summary: Replace VNC with RDP (#2231339)

:Description:
As part of the X11 dependencies removals, Anaconda also drops VNC. As a replacement
RDP (Remote Desktop Protocol) is implemented.

What has changed:
- Adding new kernel boot arguments: ``inst.rdp``, ``inst.rdp.username``, ``inst.rdp.password``.
- Drop existing kernel boot argument: ``inst.vnc``, ``inst.vncpassword``, ``inst.vncconnect``.
- Drop the existing ``vnc`` kickstart command.

:Links:
- https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application
- https://github.com/rhinstaller/anaconda/pull/5829
- https://bugzilla.redhat.com/show_bug.cgi?id=1955025
13 changes: 13 additions & 0 deletions docs/release-notes/wayland-migration.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
:Type: GUI
:Summary: Migrate Anaconda to Wayland application (#2231339)

:Description:
This change enables Anaconda to run natively on Wayland. Previously, Anaconda operated as an
Xorg application or relied on XWayland for support.

By implementing this update, we can eliminate dependencies on X11 and embrace newer, more
secure technologies.

:Links:
- https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application
- https://github.com/rhinstaller/anaconda/pull/5829
5 changes: 0 additions & 5 deletions pyanaconda/core/configuration/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,6 @@ def can_configure_keyboard(self):
"""Can we configure the keyboard?"""
return self._is_boot_iso or self._is_live_os or self._is_booted_os

@property
def can_run_on_xwayland(self):
"""Could we run on XWayland?"""
return self._is_live_os

@property
def can_modify_syslog(self):
"""Can we modify syslog?"""
Expand Down
43 changes: 5 additions & 38 deletions pyanaconda/keyboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from pyanaconda.core.configuration.anaconda import conf
from pyanaconda import localization
from pyanaconda.core.constants import DEFAULT_KEYBOARD
from pyanaconda.core.util import execWithRedirect
from pyanaconda.modules.common.task import sync_run_task
from pyanaconda.modules.common.constants.services import LOCALIZATION

Expand Down Expand Up @@ -56,47 +55,15 @@ class InvalidLayoutVariantSpec(Exception):
pass


def _is_xwayland():
"""Is Anaconda running in XWayland environment?

This can't be easily detected from the Anaconda because Anaconda
is running as XWayland app. Use xisxwayland tool for the detection.
"""
try:
rc = execWithRedirect('xisxwayland', [])

if rc == 0:
return True

log.debug(
"Anaconda doesn't run on XWayland. "
"See xisxwayland --help for more info."
)
except FileNotFoundError:
log.warning(
"The xisxwayland tool is not available! "
"Taking the environment as not Wayland."
)

return False


def can_configure_keyboard():
"""Can we configure the keyboard?

FIXME: This is a temporary solution.

The is_wayland logic is not part of the configuration so we would
have to add it to the configuration otherwise it won't be accessible
in the Anaconda modules.
NOTE:
This function could be inlined, however, this give us a possibility for future limitation
when needed. For example we could use this method to limit keyboard configuration if we
are able to detect that current system doesn't support localed keyboard layout switching.
"""
if not conf.system.can_configure_keyboard:
return False

if conf.system.can_run_on_xwayland and _is_xwayland():
return False

return True
return conf.system.can_configure_keyboard


def parse_layout_variant(layout_variant_str):
Expand Down
5 changes: 0 additions & 5 deletions pyanaconda/modules/common/constants/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@

# Session services.

GK_INPUT_SOURCES = DBusServiceIdentifier(
namespace=("org", "gnome", "Kiosk"),
message_bus=SessionBus
)

MUTTER_DISPLAY_CONFIG = DBusServiceIdentifier(
namespace=("org", "gnome", "Mutter", "DisplayConfig"),
message_bus=SessionBus
Expand Down
135 changes: 0 additions & 135 deletions pyanaconda/modules/localization/gk_keyboard_manager.py

This file was deleted.

Loading
Loading