From d7e2067fdbaaddbeb545dd981344437d9051921c Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 2 Apr 2018 22:32:46 +0100
Subject: Update and improve the examples.

---
 examples/gui/config/build.cfg | 46 ++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'examples/gui/config/build.cfg')

diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index bb95e5d..2506d8f 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -22,7 +22,7 @@ sub build_title {
 
 my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
 
-my $_l = {
+my $config = {
     system => {
         enabled_media => [
             'Core Release',
@@ -58,8 +58,8 @@ my $_l = {
             # No distribution license.
             'flash-player-plugin',
         ],
-        preferred_packages => [
-        ],
+#       preferred_packages => [
+#       ],
         local_repo_packages => [
             # core
             'broadcom-bcma-config',
@@ -77,6 +77,8 @@ my $_l = {
             'dkms-nvidia-current', 'x11-driver-video-nvidia-current',
         ],
 
+        langs_always => [ 'en_US' ],
+
         post_install => join(";",
             # systemd boots by default to multiuser.target (old init 3), so change to graphical (old init 5).
             "ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target",
@@ -85,12 +87,10 @@ my $_l = {
             "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' /etc/inittab",
         ),
 
-        langs_always => [ 'en_US' ],
-
-        disable_services => [
-        ],
-        disable_timers => [
-        ],
+#       disable_services => [
+#       ],
+#       disable_timers => [
+#       ],
         files => [
             # Clean configuration files.
             [ 'files/empty.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
@@ -132,8 +132,8 @@ my $_l = {
             "/var/lib/dbus/machine-id",
             "/etc/ssh/ssh_host_*",
         ],
-        patches => [
-        ],
+#       patches => [
+#       ],
         final_fixes => join(';',
             # Get default user name.
             "default_user=`grep 1000:1000 /etc/passwd`",
@@ -170,19 +170,13 @@ my $_l = {
         vga_mode => 788,
     },
     loopbacks => {
-        exclude => {
-            type => 'squashfs',
-            files => [
-                { path => '/root/drakx' },
-            ],
-        },
-    },
-    regions => {
-        # the "all" region has a magical behavior and selects all langs
+        exclude => [
+            { path => '/root/drakx' },
+        ],
     },
-    copy_from_repo => [
-        'isolinux/memtest'  => "boot/memtest",
-    ],
+#   regions => {
+#       # the "all" region has a magical behavior and selects all langs
+#   },
     media => {
         storage             => 'iso',
         label               => build_label($build),
@@ -199,7 +193,7 @@ my $_l = {
             ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot' },
             'Install Mageia Live'                            => { append => $default_append . ' xdriver=free install' },
             ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
-            'Memory Test'                                    => { command => 'linux16', image  => '/boot/memtest', initrd => '' },
+            'Memory Test'                                    => { command => 'linux16', image  => '/boot/memtest', initrd => 'none' },
         ],
         mbr_boot_img        => '/usr/share/drakiso-bootloader/images/boot_hybrid.img',
         eltorito_img        => '/usr/share/drakiso-bootloader/images/eltorito.img',
@@ -211,6 +205,8 @@ my $_l = {
             efi_type        => '64bit',
             boot64_efi      => '/usr/share/drakiso-bootloader/images/bootx64.efi'
         ),
+        copy_from_repo => [
+            'isolinux/memtest'  => 'boot/memtest',
+        ],
     },
-    mount => MGA::DrakISO::Mounts::volatile_squash_union(),
 };
-- 
cgit v1.2.1