Choose tty7 for x11 console during Agama install

lkocman · Sep 5, 2024 · b545964 · b545964
1 parent 20f3fa9
commit b545964
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/utils.pm b/lib/utils.pm
@@ -1525,6 +1525,7 @@ the session.
 
 sub get_x11_console_tty {
     my $new_sddm = (!is_sle('<15-SP6') && !is_leap('<15.6')) || is_krypton_argon;
+    # Agama uses tty7 for graphical install
     if (check_var('DESKTOP', 'kde') || check_var('DESKTOP', 'lxqt')) {
         return $new_sddm ? 2 : 7;
     }

diff --git a/tests/installation/agama.pm b/tests/installation/agama.pm
@@ -92,6 +92,10 @@ sub upload_agama_logs {
     upload_logs('/tmp/agama-logs.tar.gz');
 }
 
+sub get_agama_install_console_tty {
+    return 7;
+}
+
 sub run {
     my ($self) = @_;
     assert_screen('agama-inst-welcome-product-list');
@@ -174,7 +178,7 @@ sub run {
     }
 
     assert_screen('agama-congratulations');
-    console('installation')->set_tty(get_x11_console_tty());
+    console('installation')->set_tty(get_agama_install_console_tty());
     upload_agama_logs();
     select_console('installation', await_console => 0);
     ensure_unlocked_desktop();