summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO/Loopback.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-09 23:34:24 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-10 00:38:35 +0000
commit57060f5254e48a9eead04426803d4f102f2b0a4b (patch)
tree3dc19e87420be8334dd7411c91fdfd8c8984df5b /lib/MGA/DrakISO/Loopback.pm
parent63555aa270059488b013e6c802cca64a8d6eebdc (diff)
downloaddrakiso-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/Loopback.pm')
-rw-r--r--lib/MGA/DrakISO/Loopback.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/MGA/DrakISO/Loopback.pm b/lib/MGA/DrakISO/Loopback.pm
index 219b9b8..4a994b5 100644
--- a/lib/MGA/DrakISO/Loopback.pm
+++ b/lib/MGA/DrakISO/Loopback.pm
@@ -50,9 +50,9 @@ our %loop_types;
extension => '-lzma.sqfs',
build => sub {
my ($build, $dir) = @_;
- my $dest = $build->get_builddir('loopbacks') . $dir->{path} . $loop_types{squashfs}{extension};
+ my $dest = $build->get_build_dir('loopbacks') . $dir->{path} . $loop_types{squashfs}{extension};
mkdir_p(dirname($dest));
- my $root = $dir->{root} || $build->get_system_root;
+ my $root = $dir->{root} || $build->get_live_root;
my $src = $root . $dir->{build_from};
my $total = directory_usage($src);
print "Have to process " . int($total/1000000) . " MB\n" if $::verbose;
@@ -125,7 +125,7 @@ our %loop_types;
extension => '.loop',
build => sub {
my ($build, $dir) = @_;
- my $dest = $build->get_builddir('loopbacks') . $dir->{path} . $loop_types{loopfs}{extension};
+ my $dest = $build->get_build_dir('loopbacks') . $dir->{path} . $loop_types{loopfs}{extension};
mkdir_p(dirname($dest));
MGA::DrakISO::Utils::device_allocate_file($dest, $dir->{pre_allocate});
MGA::DrakISO::Utils::device_mkfs($dest, $dir->{fs}) if !defined $dir->{min_size};
@@ -179,7 +179,7 @@ our %loop_types;
sub has_squashfs4_with {
my ($build, $comp) = @_;
my $ucomp = uc($comp);
- cat_($build->get_system_root . "/boot/config-" . $build->find_kernel->{version}) =~ /^CONFIG_SQUASHFS_$ucomp=y$/m;
+ cat_($build->get_live_root . "/boot/config-" . $build->find_kernel->{version}) =~ /^CONFIG_SQUASHFS_$ucomp=y$/m;
}
sub mksquashfs4_compressors() {