summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-02 19:55:30 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-02 19:55:30 +0100
commit54fcb97d173520e44ef5441176fe7e39153eb3c5 (patch)
tree1d297c08642db0547c539a7f4b0c3d98b187facc /lib/MGA/DrakISO
parent76abcd91020a70f9b90a0b0748b0128efaebddf9 (diff)
downloaddrakiso-54fcb97d173520e44ef5441176fe7e39153eb3c5.tar
drakiso-54fcb97d173520e44ef5441176fe7e39153eb3c5.tar.gz
drakiso-54fcb97d173520e44ef5441176fe7e39153eb3c5.tar.bz2
drakiso-54fcb97d173520e44ef5441176fe7e39153eb3c5.tar.xz
drakiso-54fcb97d173520e44ef5441176fe7e39153eb3c5.zip
Simplify use of predefined mounts and add default mount type.
Diffstat (limited to 'lib/MGA/DrakISO')
-rw-r--r--lib/MGA/DrakISO/Config.pm2
-rw-r--r--lib/MGA/DrakISO/Mounts.pm4
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/MGA/DrakISO/Config.pm b/lib/MGA/DrakISO/Config.pm
index 84363fb..5995bda 100644
--- a/lib/MGA/DrakISO/Config.pm
+++ b/lib/MGA/DrakISO/Config.pm
@@ -83,6 +83,8 @@ sub complete_config {
$build->{settings}{workdir} = abs_path($build->{settings}{workdir} || '.');
+ $build->{mount} ||= volatile_squash_union();
+
mkdir_p($build->get_build_dir);
mkdir_p($build->get_chroot_dir);
}
diff --git a/lib/MGA/DrakISO/Mounts.pm b/lib/MGA/DrakISO/Mounts.pm
index c4714b2..a374a9e 100644
--- a/lib/MGA/DrakISO/Mounts.pm
+++ b/lib/MGA/DrakISO/Mounts.pm
@@ -30,6 +30,10 @@ use strict;
use MDK::Common;
+use Exporter;
+our @ISA = qw(Exporter);
+our @EXPORT = qw(simple_union, squash_rw_union, squash_union, volatile_squash_union);
+
our $dir_distrib_sqfs = {
mountpoint => '/distrib',
type => 'squashfs',