From bb3602d4081e5d6d56ea3629f808cc2ed5f56f94 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 29 Nov 2017 14:24:40 +0000
Subject: draklive2: major rework to use grub2 as the bootloader.

Drop some unwanted stuff in the process:
  - the --boot-only option (not really very useful)
  - the progress indicator in build_iso_image()
    (xorriso reports progress itself)
---
 lib/MDV/Draklive/Config.pm  | 5 ++++-
 lib/MDV/Draklive/Storage.pm | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/MDV/Draklive/Config.pm b/lib/MDV/Draklive/Config.pm
index 99ca16a..dfbb596 100644
--- a/lib/MDV/Draklive/Config.pm
+++ b/lib/MDV/Draklive/Config.pm
@@ -48,15 +48,18 @@ sub complete_config {
 
     my $default_prefix = {
         build => {
+            EFI => '/EFI',
             boot => '/boot',
-            files => '/files',
             dist => '/dist',
+            files => '/files',
+            images => '/images',
             initrd => '/initrd',
             loopbacks => '/loopbacks',
             modules => '/modules',
             scripts => '/scripts',
         },
         media => {
+            EFI => '/EFI',
             boot => '/boot',
             hidden_boot => '/.boot',
             loopbacks => '/loopbacks',
diff --git a/lib/MDV/Draklive/Storage.pm b/lib/MDV/Draklive/Storage.pm
index 0bf1fa9..e531dc7 100644
--- a/lib/MDV/Draklive/Storage.pm
+++ b/lib/MDV/Draklive/Storage.pm
@@ -6,7 +6,6 @@ our %storage_types = (
     iso => {
         modules => 'bus/firewire|usb disk/firewire|hardware_raid|ide|sata|scsi|usb',
         fs => 'iso9660',
-        can_hide => 0,
         source => 'LABEL=MDVISOROOT',
         read_only => 1,
         create => \&main::create_iso_master,
-- 
cgit v1.2.1