Skip to content

Commit

Permalink
Support install_url with split repodata per arch
Browse files Browse the repository at this point in the history
- Add split repodata support for bootloader install_url
  and zdup
- Relates: code-o-o#leap/features#193
  • Loading branch information
lkocman committed Mar 7, 2025
1 parent c35a99f commit 0944090
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
10 changes: 10 additions & 0 deletions lib/bootloader_setup.pm
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,13 @@ sub bootmenu_default_params {
if (get_var('REPO_0')) {
my $host = get_var('OPENQA_HOST', 'https://openqa.opensuse.org');
my $repo = get_var('REPO_0');

# Split repodata functionality in Leap 16.0
# https://code.opensuse.org/leap/features/issue/193
if (get_var('SPLIT_REPODATA')) {
$repo .= "/\$basearch";
}

# inst.install_url supports comma separated list if more repos are needed ...
push @params, "inst.install_url=$host/assets/repo/$repo";
}
Expand Down Expand Up @@ -893,6 +900,9 @@ sub specific_bootmenu_params {
}

if (my $agama_install_url = get_var('AGAMA_INSTALL_URL')) {
if (get_var('SPLIT_REPODATA')) {
$agama_install_url .= "/\$basearch";
}
push @params, "inst.install_url=$agama_install_url";
}

Expand Down
5 changes: 5 additions & 0 deletions tests/installation/zdup.pm
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ sub run {
my $nr = 1;
foreach my $r (split(/,/, get_var('ZDUPREPOS', $defaultrepo))) {
$r =~ s/^\s+|\s+$//g;
# Split repodata functionality in Leap 16.0
# https://code.opensuse.org/leap/features/issue/193
if (get_var('SPLIT_REPODATA')) {
$r .= "/\$basearch";
}
zypper_call("--no-gpg-checks ar \"$r\" repo$nr");
$nr++;
}
Expand Down

0 comments on commit 0944090

Please sign in to comment.