summaryrefslogtreecommitdiffstats
path: root/draklive2
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-08 08:53:35 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-15 22:06:36 +0100
commit7c0cab87133acd7df0084f495b3d4f52fbf2dc9b (patch)
tree3d09465e7fdb83c2e322c3f11d6cf202ca5f09b5 /draklive2
parenta6451ba864ca95299cbfded9d7b04d9001961ebb (diff)
downloaddrakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar.gz
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar.bz2
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar.xz
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.zip
Remove obsolute support for different mount and loopback options.
The dracut-generated initrd doesn't support them.
Diffstat (limited to 'draklive2')
-rwxr-xr-xdraklive25
1 files changed, 1 insertions, 4 deletions
diff --git a/draklive2 b/draklive2
index 567f4c1..e6887f5 100755
--- a/draklive2
+++ b/draklive2
@@ -30,7 +30,6 @@ use Pod::Usage;
use MGA::DrakISO::Config;
use MGA::DrakISO::LiveBuild;
-use MGA::DrakISO::Mounts;
use MGA::DrakISO::Utils;
use MGA::DrakISO::BuildRoot;
@@ -88,7 +87,7 @@ my @actions = (
{ name => 'boot', do => \&prepare_boot },
{ name => 'boot-system', do => \&prepare_live_system_boot },
{ name => 'boot-loader', do => \&prepare_iso_bootloader },
- { name => 'loop', do => \&build_live_loopback_files },
+ { name => 'loop', do => \&build_live_loopback_file },
{ name => 'master', do => \&build_iso },
);
my @all = qw(root boot loop master);
@@ -117,8 +116,6 @@ require standalone;
check_config($build_object);
complete_config($build_object);
- $build_object->{mount} ||= MGA::DrakISO::Mounts::volatile_squash_union();
-
foreach my $region ($build_object->{all_regions} ? sort(keys %{$build_object->{regions}}) : $build_object->{settings}{region}) {
$region and print qq(=== proceeding with region "$region"\n);
$build_object->{settings}{region} = $region;