Utilize agama.install_url

* introduced in agama-project/agama#1545
lkocman · Aug 27, 2024 · 9e42b9a · 9e42b9a
1 parent 4979498
commit 9e42b9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/bootloader_setup.pm b/lib/bootloader_setup.pm
@@ -594,6 +594,15 @@ sub bootmenu_default_params {
         }
 
     }
+    if (get_var('AGAMA_AUTO')) {
+        my $path = data_url(get_var('AGAMA_AUTO'));
+        set_var('EXTRABOOTPARAMS', "agama.auto=\"$path\"");
+    }
+    if (get_var('AGAMA_INSTALL_URL')) {
+        my $url = data_url(get_var('AGAMA_INSTALL_URL'));
+        set_var('EXTRABOOTPARAMS', "agama.install=\"$url\"");
+    }
+
     if (!get_var("NICEVIDEO")) {
         if (is_microos || is_selfinstall) {
             push @params, get_bootmenu_console_params $args{baud_rate};

diff --git a/tests/installation/bootloader.pm b/tests/installation/bootloader.pm
@@ -46,7 +46,8 @@ sub run {
     # 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')) {
-        return;
+        $boot_cmd = 'ctrl-x';
+        bootmenu_default_params; # Sets agama.install_url
     }
     if (is_livecd && check_var('LIVECD_LOADER', 'grub2')) {
         $boot_cmd = 'ctrl-x';