summaryrefslogtreecommitdiffstats
path: root/lib/MGA
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-18 21:26:09 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-18 21:26:09 +0000
commit45af27325ded155ab7ce4c76daedd053d9d504cc (patch)
tree4f9a2159f10c681b189ed6fe732b6c28d11793bd /lib/MGA
parent996706b13c0354ae98e08f4cd54eae2a5868434c (diff)
downloaddrakiso-45af27325ded155ab7ce4c76daedd053d9d504cc.tar
drakiso-45af27325ded155ab7ce4c76daedd053d9d504cc.tar.gz
drakiso-45af27325ded155ab7ce4c76daedd053d9d504cc.tar.bz2
drakiso-45af27325ded155ab7ce4c76daedd053d9d504cc.tar.xz
drakiso-45af27325ded155ab7ce4c76daedd053d9d504cc.zip
Properly import $dir_distrib_sqfs into Loopback module.
Allows 'use strict' to be added to that module.
Diffstat (limited to 'lib/MGA')
-rw-r--r--lib/MGA/DrakISO/Loopback.pm4
-rw-r--r--lib/MGA/DrakISO/Mounts.pm2
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/MGA/DrakISO/Loopback.pm b/lib/MGA/DrakISO/Loopback.pm
index 5e8e38e..ed8cba7 100644
--- a/lib/MGA/DrakISO/Loopback.pm
+++ b/lib/MGA/DrakISO/Loopback.pm
@@ -1,8 +1,10 @@
package MGA::DrakISO::Loopback;
+use strict;
use MDK::Common;
use File::Temp;
+use MGA::DrakISO::Mounts;
use MGA::DrakISO::Progress;
use MGA::DrakISO::Utils;
@@ -105,7 +107,7 @@ our %loop_types;
mount => sub {
my ($dir) = @_;
$dir->{loop} = "/dev/loop" . $loop_number++;
- my $sqfs = $dir_distrib_sqfs->{mountpoint};
+ my $sqfs = $MGA::DrakISO::Mounts::dir_distrib_sqfs->{mountpoint};
my $fsck = "chroot </dev/tty1 /live/$sqfs /sbin/fsck $dir->{loop}";
my $extension = $dir->{path} . $loop_types{loopfs}{extension};
my $mountpoint = $dir->{mountpoint};
diff --git a/lib/MGA/DrakISO/Mounts.pm b/lib/MGA/DrakISO/Mounts.pm
index c3c408d..ceaeb8b 100644
--- a/lib/MGA/DrakISO/Mounts.pm
+++ b/lib/MGA/DrakISO/Mounts.pm
@@ -4,7 +4,7 @@ use strict;
use MDK::Common;
-my $dir_distrib_sqfs = {
+our $dir_distrib_sqfs = {
mountpoint => '/distrib',
type => 'squashfs',
path => '/distrib',