From 505bfb9a7ade6a916d7869605a4f7a292de22776 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 19 Dec 2017 16:01:31 +0000
Subject: Replace $live by $build throughout,

Ready for adding support for classic installer builds.
---
 lib/MGA/DrakISO/BuildLoop.pm | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

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

diff --git a/lib/MGA/DrakISO/BuildLoop.pm b/lib/MGA/DrakISO/BuildLoop.pm
index c8f3b06..9e98bd1 100755
--- a/lib/MGA/DrakISO/BuildLoop.pm
+++ b/lib/MGA/DrakISO/BuildLoop.pm
@@ -35,54 +35,54 @@ our @ISA = qw(Exporter);
 our @EXPORT = qw(build_live_loopback_files list_loopback_modules);
 
 sub build_live_loopback_files {
-    my ($live) = @_;
+    my ($build) = @_;
     # make sure no external filesystems are mounted before creating the loopback
-    umount_external_fs($live);
+    umount_external_fs($build);
 
-    my @excluded_files = expand_file_list($live, @{$live->{loopbacks}{exclude}{files} || []});
-    my @modules_files = expand_file_list($live, @{$live->{loopbacks}{modules} || []});
+    my @excluded_files = expand_file_list($build, @{$build->{loopbacks}{exclude}{files} || []});
+    my @modules_files = expand_file_list($build, @{$build->{loopbacks}{modules} || []});
 
-    foreach (grep { exists $loop_types{$_->{type}}{build} } @{$live->{mount}{dirs} || []}) {
+    foreach (grep { exists $loop_types{$_->{type}}{build} } @{$build->{mount}{dirs} || []}) {
         local $_->{exclude} = [ @excluded_files, @modules_files ];
-        $loop_types{$_->{type}}{build}->($live, $_);
+        $loop_types{$_->{type}}{build}->($build, $_);
     }
 
-    foreach my $module (list_loopback_modules($live)) {
-        my $copy_tree = $live->get_system_root . "/tmp/draklive/loop/$module->{name}";
+    foreach my $module (list_loopback_modules($build)) {
+        my $copy_tree = $build->get_system_root . "/tmp/draklive/loop/$module->{name}";
         eval { rm_rf($copy_tree) };
-        hardlink_filtered($live->get_system_root, $copy_tree, $module->{files});
+        hardlink_filtered($build->get_system_root, $copy_tree, $module->{files});
         my $loop = $loop_types{$module->{type}};
-        $loop->{build}->($live, { path => "/modules/$module->{name}", root => $copy_tree, exclude => \@excluded_files });
+        $loop->{build}->($build, { path => "/modules/$module->{name}", root => $copy_tree, exclude => \@excluded_files });
         eval { rm_rf($copy_tree) };
     }
 
     if (@excluded_files) {
-        my $excluded_tree = $live->get_system_root . "/tmp/draklive/excluded/all";
+        my $excluded_tree = $build->get_system_root . "/tmp/draklive/excluded/all";
         eval { rm_rf($excluded_tree) };
-        hardlink_filtered($live->get_system_root, $excluded_tree, \@excluded_files);
+        hardlink_filtered($build->get_system_root, $excluded_tree, \@excluded_files);
 
-        foreach my $module (list_loopback_modules($live)) {
-            my $copy_tree = $live->get_system_root . "/tmp/draklive/excluded/$module->{name}";
+        foreach my $module (list_loopback_modules($build)) {
+            my $copy_tree = $build->get_system_root . "/tmp/draklive/excluded/$module->{name}";
             eval { rm_rf($copy_tree) };
             hardlink_filtered($excluded_tree, $copy_tree, $module->{files});
             my $loop = $loop_types{$module->{type}};
-            $loop->{build}->($live, { path => "/modules/excluded-$module->{name}", root => $copy_tree });
+            $loop->{build}->($build, { path => "/modules/excluded-$module->{name}", root => $copy_tree });
             eval { rm_rf($copy_tree) };
         }
 
-        my $loop = $loop_types{$live->{loopbacks}{exclude}{type}};
-        $loop->{build}->($live, { path => "/excluded", root => $excluded_tree, exclude => \@modules_files });
+        my $loop = $loop_types{$build->{loopbacks}{exclude}{type}};
+        $loop->{build}->($build, { path => "/excluded", root => $excluded_tree, exclude => \@modules_files });
 
         eval { rm_rf($excluded_tree) };
     }
 }
 
 sub expand_file_list {
-    my ($live, @files) = @_;
+    my ($build, @files) = @_;
     map {
         $_->{path} ?
           $_->{path} :
-          chomp_(cat_(glob(($_->{rooted} && $live->get_system_root) . $_->{source})));
+          chomp_(cat_(glob(($_->{rooted} && $build->get_system_root) . $_->{source})));
     } @files;
 }
 
@@ -101,16 +101,16 @@ sub hardlink_filtered {
 }
 
 sub list_loopback_modules {
-    my ($live) = @_;
+    my ($build) = @_;
     map {
         my $l = $_;
         map {
             my $list = $_;
             my $name = basename($list);
             $name =~ s/\.[^.]+$//;
-            { type => $l->{type}, name => $name, files => [ expand_file_list($live, { source => $list }) ] };
-        } glob(($_->{rooted} && $live->get_system_root) . $_->{source});
-    } @{$live->{loopbacks}{modules}};
+            { type => $l->{type}, name => $name, files => [ expand_file_list($build, { source => $list }) ] };
+        } glob(($_->{rooted} && $build->get_system_root) . $_->{source});
+    } @{$build->{loopbacks}{modules}};
 }
 
 1;
-- 
cgit v1.2.1