From 7c0cab87133acd7df0084f495b3d4f52fbf2dc9b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
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.
---
 lib/MGA/DrakISO/BuildRoot.pm | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'lib/MGA/DrakISO/BuildRoot.pm')

diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm
index d1f4531..1b3ed34 100644
--- a/lib/MGA/DrakISO/BuildRoot.pm
+++ b/lib/MGA/DrakISO/BuildRoot.pm
@@ -35,7 +35,6 @@ use urpm::media;
 use urpm::select;
 
 use MGA::DrakISO::LiveBuild;
-use MGA::DrakISO::Loopback;
 use MGA::DrakISO::Utils;
 
 use Exporter;
@@ -570,20 +569,11 @@ sub customise_live_system {
         }
 
         # Create fstab.
-        my $mount_options = $build->get_media_setting('mount_options') || 'defaults';
-        my $fstab_entry;
-        if ($build->{mount}{overlay}) {
-            $fstab_entry = "none / $build->{mount}{overlay} $mount_options 0 0";
-        } else {
-            $fstab_entry = $build->get_media_setting('source') . " / " . $build->get_media_setting('fs') . " $mount_options 1 1";
-        }
-        output_to_root($root, '/etc/fstab', 0644, $fstab_entry);
+        output_to_root($root, '/etc/fstab', 0644, 'none / overlay defaults 0 0');
 
         # Interactive mode can lead to race in initscripts.
         run_as_root('sed', '-i', 's/^PROMPT=.*/PROMPT=no/', $root . '/etc/sysconfig/init');
 
-        configure_draklive_resize($build);
-
         print "..copying additional files\n" if $::verbose > 1;
 
         # Copy extra files as requested by the user.
@@ -635,25 +625,6 @@ sub customise_live_system {
     defined $error_message && die $error_message;
 }
 
-sub configure_draklive_resize {
-    my ($build) = @_;
-
-    my $resizable_loopback = find { $_->{min_size} } @{$build->{mount}{dirs} || []};
-    if ($resizable_loopback) {
-        my $ext = $loop_types{$resizable_loopback->{type}}{extension};
-        my @text = (
-            "DRAKLIVE_RESIZE=yes",
-            "LOOPBACK=/live/media/loopbacks$resizable_loopback->{path}$ext",
-            "TYPE=$resizable_loopback->{fs}",
-            "MIN_SIZE=$resizable_loopback->{min_size}",
-            "MOUNT=/live$resizable_loopback->{mountpoint}_resized",
-            "OLD_MOUNT=/live$resizable_loopback->{mountpoint}",
-            "UNION=/",
-        );
-        output_to_root($build->get_live_root, '/etc/sysconfig/draklive-resize', undef, @text);
-    }
-}
-
 sub clean_system_conf_file {
     my ($file) = @_;
 
-- 
cgit v1.2.1