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.

Sign up for GitHub

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

Jump to bottom

Rhel 10 cleanup xorg and vnc leftovers #5736

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Rhel 10 cleanup xorg and vnc leftovers #5736

merged 2 commits into from
Jul 25, 2024

Conversation

M4rtinK
Copy link
Contributor

@M4rtinK M4rtinK commented Jul 1, 2024

Xorg and VNC related cleanups.

@M4rtinK
Copy link
Contributor Author

M4rtinK commented Jul 2, 2024

/kickstart-test --testtype smoke

@KKoukiou KKoukiou self-requested a review July 2, 2024 17:10
@M4rtinK M4rtinK force-pushed the rhel-10-cleanup_xorg_and_vnc_leftovers branch from f074048 to ae871f0 Compare July 10, 2024 10:25
@jstodola
Copy link
Contributor

While testing more use cases on s390x I noticed there are a few additional instances of "x11" in the code that should be updated. In my case gnome-kiosk failed to start because of it. The following change fix that for me:

diff --git a/data/systemd/anaconda-direct.service b/data/systemd/anaconda-direct.service
index 2f09e05975..e05c4408c4 100644
--- a/data/systemd/anaconda-direct.service
+++ b/data/systemd/anaconda-direct.service
@@ -7,7 +7,7 @@ ConditionPathIsDirectory=|/sys/hypervisor/s390
 ConditionKernelCommandLine=|inst.notmux
 
 [Service]
-Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr GDK_BACKEND=x11 XDG_RUNTIME_DIR=/tmp LANG=en_US.UTF-8
+Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr GDK_BACKEND=wayland XDG_RUNTIME_DIR=/run/user/0 GIO_USE_VFS=local LANG=en_US.UTF-8
 Type=oneshot
 WorkingDirectory=/root
 ExecStart=/usr/sbin/anaconda

Please, have a look also at other "x11" strings in the code.

@M4rtinK
Copy link
Contributor Author

M4rtinK commented Jul 10, 2024

Please, have a look also at other "x11" strings in the code.

Good catch, will do that! :) I have been mostly looking for "xorg, "x org", etc. X11 is a good candidate as well. :)

@M4rtinK M4rtinK force-pushed the rhel-10-cleanup_xorg_and_vnc_leftovers branch from ae871f0 to f4cc0f0 Compare July 10, 2024 16:06
jkonecny12
jkonecny12 approved these changes Jul 11, 2024
View reviewed changes
Copy link
Member

@jkonecny12 jkonecny12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@jkonecny12
Copy link
Member

Please fix the tests.

@M4rtinK
Handle inst.rdp in Dracut
d331ba0 
Looks like we enable network already in dracut if inst.vnc is used,
lets switch the code to work with inst.rdp.

Also drop the VNC related commands, as they are no longer
expected to be used.

Resolves: RHEL-41219
@M4rtinK
Cleanup remaining Xorg and VNC references and dead code
ee14273 
After the main PR series that turned Anaconda into a native Wayland
application and switched from VNC to RDP fro remote access, there were
still some leftovers here and there.

So lets address those - adjust various references in doc strings to
correctly mention Wayland and RDP. And also drop various bits of code
that are no longer needed.

Lastly, drop a few Anaconda boot options that no longer work in the
Wayland world:

- xdriver
- usefbx
- vnc
- vncconnect
- vncpassword

NOTE: Even with Anaconda running natively on a Wayland compositor,
keyboard layouts are still called X layouts. This is the correct,
as Wayland is still using the keyboard layout format introduced by
the X server.

Resolves: RHEL-41219
@M4rtinK M4rtinK force-pushed the rhel-10-cleanup_xorg_and_vnc_leftovers branch from f4cc0f0 to ee14273 Compare July 24, 2024 12:35
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Jul 25, 2024

Added two separate PRs that mark the kickstart vnc command as deprecated, that can be handled separately from this PR as not to block it. :)

pykickstart/pykickstart#497
#5785

@M4rtinK
Copy link
Contributor Author

M4rtinK commented Jul 25, 2024

/kickstart-test --skip-testtypes knownfailure,manual,skip-on-rhel,skip-on-rhel-10,gh576,gh640,gh804,gh1090,gh1104,gh1106,gh1105,gh1108,gh1109,gh1107,gh1110

@M4rtinK
Copy link
Contributor Author

M4rtinK commented Jul 25, 2024

Checked the results of the full RHEL 10 kstest run:

  • the keyboard switching flake
  • a few known storage related flakes
  • an issue with a soon to be removed dracut test using vnc boot option for testing

So all in all, nothing relevant as far as I can tell & the PR should be finally good to go. :)

@M4rtinK M4rtinK merged commit 317c629 into rhinstaller:rhel-10 Jul 25, 2024
9 of 10 checks passed
@jkonecny12 jkonecny12 mentioned this pull request Aug 21, 2024
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkonecny12 jkonecny12 jkonecny12 approved these changes

@KKoukiou KKoukiou Awaiting requested review from KKoukiou

Assignees
No one assigned
Labels
documentation rhel-10
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@M4rtinK @jstodola @jkonecny12