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: Do not crash if RDP is selected after regular GUI startup failed #6037

Open
wants to merge 2 commits into
base: rhel-10
Choose a base branch
from

Conversation

jkonecny12
Copy link
Member

@jkonecny12 jkonecny12 commented Dec 4, 2024

The ask_rd_question() function returns not only the credentials tuple, but also the "use remote desktop" flag.

We correctly handled that in the regular case where we ask for user password if user selected RDP instead of text mode.

But we missed that in the harder to test case where RDP is suggested as an option to the user after regular locally running GUI startup fails. Oops! :P

So handle the extra value and avoid the crash. :)

Backport of #5999
Resolves: RHEL-69940

M4rtinK and others added 2 commits December 4, 2024 16:12
…26410)

The ask_rd_question() function returns not only the credentials tuple,
but also the "use remote desktop" flag.

We correctly handled that in the regular case where we ask for user
password if user selected RDP instead of text mode.

But we missed that in the harder to test case where RDP is suggested
as an option to the user after regular locally running GUI startup
fails. Oops! :P

So handle the extra value and avoid the crash. :)

Resolves: rhbz#2326410
Resolves: RHEL-69940
(cherry picked from commit d550aa1)
The ask rdp questions dialog methods in display.py were setting
display mode and flags which wasn't visible before. Let's make it
obvious in the code so we don't forget about such an issue as before.

(cherry picked from commit 4863cc6)
Related: RHEL-69940
@jkonecny12
Copy link
Member Author

/kickstart-test --testtype smoke

@jkonecny12
Copy link
Member Author

/kickstart-test ui_rdp

@jkonecny12
Copy link
Member Author

/kickstart-test --testtype coverage

@jkonecny12
Copy link
Member Author

Tested locally - works as expected.

@jkonecny12 jkonecny12 added the ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). label Dec 4, 2024
@jkonecny12
Copy link
Member Author

Setting ready_to_merge even thought it needs review.

@jkonecny12 jkonecny12 requested a review from M4rtinK December 9, 2024 10:42
Copy link
Contributor

@M4rtinK M4rtinK 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. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). rhel-10
Development

Successfully merging this pull request may close these issues.

2 participants