From 57060f5254e48a9eead04426803d4f102f2b0a4b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 9 Jan 2018 23:34:24 +0000
Subject: Miscellaneous code cleanup.

---
 lib/MGA/DrakISO/BuildBoot.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/MGA/DrakISO/BuildBoot.pm')

diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm
index 276217b..c1097de 100644
--- a/lib/MGA/DrakISO/BuildBoot.pm
+++ b/lib/MGA/DrakISO/BuildBoot.pm
@@ -51,11 +51,11 @@ our @EXPORT = qw(prepare_live_system_boot prepare_iso_bootloader);
 sub prepare_live_system_boot {
     my ($build) = @_;
 
-    my $root = $build->get_system_root;
+    my $root = $build->get_live_root;
 
     # Create a build directory. This will contain all the files we need to
     # exist in /boot on the ISO.
-    my $boot_dir = $build->get_builddir('boot');
+    my $boot_dir = $build->get_build_dir('boot');
     mkdir_p($boot_dir);
 
     # Locate the kernel we want to boot.
@@ -97,14 +97,14 @@ sub prepare_iso_bootloader {
     # do that now. We may need some of those files to correctly auto-detect
     # the default kernel and initrd.
     my $repo_prefix = $build->{settings}{repository} . '/' . $build->{settings}{arch} . '/';
-    my $copy_prefix = $build->get_builddir . '/';
+    my $copy_prefix = $build->get_build_dir . '/';
     foreach (group_by2(@{$build->{copy_from_repo}})) {
         my ($src, $dst) = @$_;
         copy_or_link($repo_prefix . $src, $copy_prefix . $dst);
     }
 
     # Create a subdirectory to hold the grub2 bootloader.
-    my $grub2_dir = $build->get_builddir('boot/grub2');
+    my $grub2_dir = $build->get_build_dir('boot/grub2');
     mkdir_p($grub2_dir);
 
     # Locate and copy the default font for the bootloader. If we can't find a
@@ -219,7 +219,7 @@ sub prepare_iso_bootloader {
 
     # Create another build directory. This will contain all the files we need
     # to exist in the /EFI directory on the ISO.
-    my $efi_root_dir = $build->get_builddir('EFI');
+    my $efi_root_dir = $build->get_build_dir('EFI');
     my $efi_boot_dir = $efi_root_dir . '/BOOT';
     mkdir_p($efi_boot_dir);
 
@@ -247,7 +247,7 @@ sub prepare_iso_bootloader {
     }
 
     # Create another build directory for temporarily storing the ESP image.
-    my $images_dir = $build->get_builddir('images');
+    my $images_dir = $build->get_build_dir('images');
     mkdir_p($images_dir);
 
     # Construct an ESP image. This is needed for USB boot.
@@ -394,14 +394,14 @@ sub get_bootloader_timeout {
 
 sub get_default_image {
     my ($build, $name) = @_;
-    -e ($build->get_builddir('boot') . '/vmlinuz') && '/boot/vmlinuz'
+    -e ($build->get_build_dir('boot') . '/vmlinuz') && '/boot/vmlinuz'
       or die "ERROR: no boot image found for '$name' boot entry\n";
 }
 
 sub get_default_initrd {
     my ($build) = @_;
-    -e ($build->get_builddir('boot') . '/initrd.gz') && '/boot/initrd.gz' ||
-    -e ($build->get_builddir('boot') . '/all.rdz')   && '/boot/all.rdz';
+    -e ($build->get_build_dir('boot') . '/initrd.gz') && '/boot/initrd.gz' ||
+    -e ($build->get_build_dir('boot') . '/all.rdz')   && '/boot/all.rdz';
 }
 
 sub get_default_append {
-- 
cgit v1.2.1