testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Work around RHBZ #1663050 (tty quitting on exit from startx)

Browse Source 
A bug showed up in Rawhide where, when you run startx in a tty,
when you exit that X session, the tty quits and returns to the
login prompt. This is a slightly sloppy workaround for that
problem.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-01-02 13:53:31 -08:00
parent 2b29ecbc18
commit ca6e1105c1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/utils.pm
View File

@ -632,13 +632,17 @@ sub quit_firefox {
send_key "ctrl-q"; send_key "ctrl-q";
# expect to get to either the tabs warning or a console # expect to get to either the tabs warning or a console
if (check_screen ["user_console", "root_console", "firefox_close_tabs"], 30) { if (check_screen ["user_console", "root_console", "firefox_close_tabs"], 30) {
# if we hit a console, we're done # if we hit the tabs warning, click it
return unless match_has_tag "firefox_close_tabs"; assert_and_click "firefox_close_tabs" if (match_has_tag "firefox_close_tabs");
# otherwise, POJITO
assert_and_click "firefox_close_tabs";
} }
# it's a bit odd if we reach here, but could mean we quit to a # FIXME workaround for RHBZ #1663050 - with systemd 240, at this
# desktop, or the firefox_close_tabs needle went stale... # point the tty quits and we wind up back at the login prompt
wait_still_screen 5;
# on all paths where we hit this sub, we want to be logged in as
# root, so let's just run through console_login again. This is
# fine for older releases which don't have the bug, console_login
# will just notice we're already logged in as root and return.
console_login(user=>'root');
} }
sub advisory_get_installed_packages { sub advisory_get_installed_packages {