From 7c0cab87133acd7df0084f495b3d4f52fbf2dc9b Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 8 Apr 2018 08:53:35 +0100 Subject: Remove obsolute support for different mount and loopback options. The dracut-generated initrd doesn't support them. --- draklive2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'draklive2') 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; -- cgit v1.2.1