diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-19 16:01:31 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-19 16:01:31 +0000 |
commit | 505bfb9a7ade6a916d7869605a4f7a292de22776 (patch) | |
tree | 9b64ce385e96bc069c8b83f5deda2d11ff05996d /lib/MGA/DrakISO/LiveBuild.pm | |
parent | 059b5c2a18e61cc7e4348e955025f9d77466647d (diff) | |
download | drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar.gz drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar.bz2 drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.tar.xz drakiso-505bfb9a7ade6a916d7869605a4f7a292de22776.zip |
Replace $live by $build throughout,
Ready for adding support for classic installer builds.
Diffstat (limited to 'lib/MGA/DrakISO/LiveBuild.pm')
-rw-r--r-- | lib/MGA/DrakISO/LiveBuild.pm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/MGA/DrakISO/LiveBuild.pm b/lib/MGA/DrakISO/LiveBuild.pm index dbfda48..67561d2 100644 --- a/lib/MGA/DrakISO/LiveBuild.pm +++ b/lib/MGA/DrakISO/LiveBuild.pm @@ -40,42 +40,42 @@ sub new { } sub default_name_fields { - my ($live) = @_; + my ($build) = @_; [ qw(name version product desktop), - if_($live->{settings}{region} ne 'all', $live->{settings}{region}), + if_($build->{settings}{region} ne 'all', $build->{settings}{region}), qw(arch media) ]; } sub get_langs { - my ($live) = @_; + my ($build) = @_; uniq( - (ref $live->{regions} ? @{$live->{regions}{$live->{settings}{region}}} : ()), - @{$live->{system}{langs_always}} + (ref $build->{regions} ? @{$build->{regions}{$build->{settings}{region}}} : ()), + @{$build->{system}{langs_always}} ); } sub get_system_root { - my ($live) = @_; - $live->{settings}{chroot} . '/' . $live->get_name . $live->get_set_suffix; + my ($build) = @_; + $build->{settings}{chroot} . '/' . $build->get_name . $build->get_set_suffix; } sub find_kernel { - my ($live) = @_; + my ($build) = @_; require bootloader; - local $::prefix = $live->get_system_root; + local $::prefix = $build->get_system_root; my @kernels = bootloader::get_kernels_and_labels(); my $kernel; - if ($live->{system}{kernel}) { - $kernel = find { $_->{version} eq $live->{system}{kernel} } @kernels; - $kernel or die "kernel $live->{system}{kernel} can not be found\n"; + if ($build->{system}{kernel}) { + $kernel = find { $_->{version} eq $build->{system}{kernel} } @kernels; + $kernel or die "kernel $build->{system}{kernel} can not be found\n"; } $kernel ||= first(@kernels) or die "no kernel can be found\n"; } sub get_initrd_name { - my ($live) = @_; - 'initrd-' . $live->find_kernel->{version} . '.img'; + my ($build) = @_; + 'initrd-' . $build->find_kernel->{version} . '.img'; } 1; |