Update examples for Mageia 10.

Change i586 to i686 and fix package lists for new or obsolete packages.
Use the GRUB "linux" command for starting Memtest86+.

2 files changed, 7 insertions, 13 deletions

diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index dc78c9e..1d39eca 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -57,18 +57,12 @@ my $config = {
             'patch',
         ],
         exclude_packages => [
-            if_($arch eq 'i586',
-                # We want the desktop586 kernel for maximum hardware compatibility.
-                '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/',
-            ),
-
             # No server kernels.
             '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/',
 
             # No proprietary drivers
             'dkms-broadcom-wl',
-            'dkms-nvidia390', 'x11-driver-video-nvidia390',
-            'dkms-nvidia-current', 'x11-driver-video-nvidia-current',
+            '/^dkms-nvidia/', '/^x11-driver-video-nvidia/',
 
             # No bootloaders.
             'grub', 'grub2', 'grub2-efi', 'lilo',
@@ -93,9 +87,9 @@ my $config = {
 
         disable_services => [
             # Uncommon hardware.
-            qw(bpalogin cpqarrayd mdadm pcscd),
+            qw(mdadm pcscd),
             # Unneeded software.
-            qw(chronyd snmpd),
+            qw(chronyd),
             # Slows down basic usage and install, reenabled after install.
             qw(crond),
         ],
@@ -168,11 +162,11 @@ my $config = {
         bootloader_timeout  => 10,
         bootloader_entries  => [
             'Boot Mageia Live' => { append => $default_append . ' noxconf' },
-            'Memory Test'      => { command => 'linux16', image  => '/boot/memtest', initrd => 'none' },
+            'Memory Test'      => { command => 'linux', 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',
-        if_($arch eq 'i586',
+        if_($arch eq 'i686',
             efi_type        => '32bit',
             boot32_efi      => '/usr/share/drakiso/bootloader/images/bootia32.efi'
         ),
diff --git a/examples/minimal/config/settings.cfg b/examples/minimal/config/settings.cfg
index 9155e3e..dcbc74a 100644
--- a/examples/minimal/config/settings.cfg
+++ b/examples/minimal/config/settings.cfg
@@ -2,9 +2,9 @@ vendor=Custom
 distro=Mageia
 product=Live
 type=Minimal
-release=8
+release=10
 arch=x86_64
 region=all
 default_user=live
-repository=http://mirrors.kernel.org/mageia/distrib/8
+repository=http://mirrors.kernel.org/mageia/distrib/10
 workdir=