From bf15bffd02290a82cb114330e8ac5527bea3abc8 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 29 Nov 2017 17:55:39 +0000
Subject: Update configuration to work with draklive2/grub2.

---
 config/auto_inst.cfg.pl |  1 +
 config/live.cfg         | 29 +++++++++++++----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'config')

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 6e9bb0c..196046c 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -166,6 +166,7 @@ $o = {
         # mageia specific
         'mageiawelcome', # nice helper app
         'mageia-doc-mcc-en', # some nice docs
+        'grub2-mageia-theme',
 
         # Gnome specific stuff
         if_($has_gnome,
diff --git a/config/live.cfg b/config/live.cfg
index e978bb3..105c3d7 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -20,7 +20,6 @@ my $_l = {
         auto_install => 'config/auto_inst.cfg.pl',
         install_env => {
         },
-        hide_media_dirs => 0,
         if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}),
         langs_always => [ 'en_US' ],
         files => [
@@ -133,10 +132,8 @@ my $_l = {
         ],
         disable_timers => [
         ],
+        append => "splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0",
         vga_mode => 788,
-        gfxboot => 1,
-        initrd_post => join("\n",
-        ),
         postInstall => join(';',
             if_($live->{settings}{default_user}, "echo $live->{settings}{default_user} > /etc/draklive-install.d/user"),
             "perl -pi -e 's,<DEFAULT_USER>,$live->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install",
@@ -245,20 +242,20 @@ my $_l = {
         int => [ map { "i18n-$_" } qw(en) ],
     },
     media => {
-        storage => 'iso',
+        storage            => 'iso',
+        source             => build_one_label($live),
+        bootloader_theme   => 'maggy',
         bootloader_timeout => 10,
-        boot_entries => [ "live"     => " xdriver=free",
-                          "live-nf"  => " nokmsboot",
-                          "linux"    => " install xdriver=free",
-                          "linux-nf" => " install nokmsboot",
-                        ],
-        source => build_one_label($live),
-        pre => [ 'for i in seq 1 5; do showlabels --removable | grep ' . build_one_label($live) . '; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
-        extra_modules => [ qw(vfat sd_mod usb_storage ehci_hcd ehci_pci ehci_platform ohci_hcd ohci_pci ohci_platform uhci_hcd xhci_hcd xhci_pci xhci_plat_hcd) ],
+        bootloader_default => 0,
+        bootloader_entries => [ 'Boot Mageia Live'                => 'xdriver=free',
+                                '  + use non-free video drivers'  => 'nokmsboot',
+                                'Install Mageia Live'             => 'install xdriver=free',
+                                '  + use non-free video drivers'  => 'install nokmsboot',
+                              ],
+        #mbr_boot_img       => 'files/grub2/boot_hybrid.img',
+        #eltorito_img       => 'files/grub2/eltorito.img',
+        #bootx64_efi        => 'files/grub2/bootx64.efi',
         files => [
-            if_($live->{settings}{arch} eq 'x86_64',
-                [ 'files/UEFI/EFI', '' ],
-            ),
             # FIXME: add doc and autorun
             #[ 'extra/livecd/autorun/*', ''],
             #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf)
-- 
cgit v1.2.1