From 54fcb97d173520e44ef5441176fe7e39153eb3c5 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 2 Apr 2018 19:55:30 +0100
Subject: Simplify use of predefined mounts and add default mount type.

---
 lib/MGA/DrakISO/Config.pm | 2 ++
 lib/MGA/DrakISO/Mounts.pm | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'lib')

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',
-- 
cgit v1.2.1