diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-09 23:34:24 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-10 00:38:35 +0000 |
| commit | 57060f5254e48a9eead04426803d4f102f2b0a4b (patch) | |
| tree | 3dc19e87420be8334dd7411c91fdfd8c8984df5b /lib/MGA/DrakISO/LiveBuild.pm | |
| parent | 63555aa270059488b013e6c802cca64a8d6eebdc (diff) | |
| download | drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar.gz drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar.bz2 drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar.xz drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.zip | |
Miscellaneous code cleanup.
Diffstat (limited to 'lib/MGA/DrakISO/LiveBuild.pm')
| -rw-r--r-- | lib/MGA/DrakISO/LiveBuild.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/MGA/DrakISO/LiveBuild.pm b/lib/MGA/DrakISO/LiveBuild.pm index c41618b..99450e0 100644 --- a/lib/MGA/DrakISO/LiveBuild.pm +++ b/lib/MGA/DrakISO/LiveBuild.pm @@ -55,22 +55,22 @@ sub get_langs { ); } -sub get_system_root { +sub get_live_root { my ($build) = @_; - $build->get_builddir('root'); + $build->get_build_dir('root'); } sub find_kernel { my ($build) = @_; require bootloader; - local $::prefix = $build->get_system_root; + local $::prefix = $build->get_live_root; my @kernels = bootloader::get_kernels_and_labels(); my $kernel; 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 or die "ERROR: kernel $build->{system}{kernel} can not be found\n"; } - $kernel ||= first(@kernels) or die "no kernel can be found\n"; + $kernel ||= first(@kernels) or die "ERROR: no kernel can be found\n"; } sub get_initrd_name { |