make it faster

lkocman · Aug 28, 2024 · a08f396 · a08f396
1 parent 340e5f9
commit a08f396
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/lib/bootloader_setup.pm b/lib/bootloader_setup.pm
@@ -35,7 +35,6 @@ our @EXPORT = qw(
   select_bootmenu_option
   uefi_bootmenu_params
   bootmenu_default_params
-  bootmenu_default_agama_params
   get_hyperv_fb_video_resolution
   bootmenu_network_source
   bootmenu_remote_target
@@ -564,23 +563,6 @@ sub get_linuxrc_boot_params {
     return @params;
 }
 
-sub bootmenu_default_agama_params {
-    my (%args) = @_;
-    my @params;
-
-    if (get_var('AGAMA_INSTALL_URL')) {
-        my $url = data_url(get_var('AGAMA_INSTALL_URL'));
-        set_var('EXTRABOOTPARAMS', "agama.install=\"$url\"");
-        send_key "e";
-        wait_still_screen(1);
-    }
-
-    push @params, get_extra_boot_params();
-
-    type_boot_parameters(" @params ") if @params;
-    return @params;
-}
-
 sub bootmenu_default_params {
     my (%args) = @_;
     my @params;
@@ -612,7 +594,6 @@ sub bootmenu_default_params {
         }
 
     }
-
     if (!get_var("NICEVIDEO")) {
         if (is_microos || is_selfinstall) {
             push @params, get_bootmenu_console_params $args{baud_rate};
@@ -627,7 +608,10 @@ sub bootmenu_default_params {
         }
         push @params, get_extra_boot_params();
     }
-
+    if (get_var('AGAMA_INSTALL_URL')) {
+        my $url = data_url(get_var('AGAMA_INSTALL_URL'));
+        push @params,"agama.install=$url";
+    }
     push @params, 'reboot_timeout=' . get_var('REBOOT_TIMEOUT', 0) unless (is_leap('<15.2') || is_sle('<15-SP2'));
 
     # https://wiki.archlinux.org/index.php/Kernel_Mode_Setting#Forcing_modes_and_EDID

diff --git a/tests/installation/bootloader.pm b/tests/installation/bootloader.pm
@@ -45,16 +45,14 @@ sub run {
     my $boot_cmd = 'ret';
     # Tumbleweed livecd has been switched to grub with kiwi 9.17.41 except 32bit
     # when LIVECD_LOADER has set grub2 then change the boot command for grub2
-    if (get_var('AGAMA')) {
-        $boot_cmd = 'ctrl-x';
-        bootmenu_default_agama_params; # Sets agama.install_url
-    }
+
     if (is_livecd && check_var('LIVECD_LOADER', 'grub2')) {
         $boot_cmd = 'ctrl-x';
         uefi_bootmenu_params;
     }
     my @params;
     push @params, bootmenu_default_params;
+    push @params, bootmenu_agama_params;
     push @params, bootmenu_network_source;
     push @params, bootmenu_remote_target;
     push @params, specific_bootmenu_params;