Update and improve the examples.

4 files changed, 97 insertions, 112 deletions

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(),
 };
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index 79e2fe8..03b12b1 100644..100755
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -3,7 +3,7 @@
 my $distro          = $build->{settings}{distro};
 my $version         = $build->{settings}{version};
 my $product         = $build->{settings}{product};
-my $desktop         = $build->{settings}{desktop};
+my $type            = $build->{settings}{type};
 my $arch            = $build->{settings}{arch};
 my $default_user    = $build->{settings}{default_user};
 
@@ -12,18 +12,19 @@ my @user_config_dirs = ('/etc/skel', '/home/' . $default_user);
 sub build_label {
     my ($build) = @_;
 
-    join('-', $distro, $version, $product, $desktop, $arch);
+    join('-', $distro, $version, $product, $type, $arch);
 }
 
 sub build_title {
     my ($build) = @_;
 
-    join(' ', $distro, $version, $product, $desktop);
+    join(' ', $distro, $version, $product, $type);
 }
 
 my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
 
-my $_l = {
+my $config = {
+    name_fields => [ qw(distro version product type arch) ],
     system => {
         enabled_media => [
             'Core Release',
@@ -34,20 +35,18 @@ my $_l = {
 
         rpmsrate_flags => [
             'LIVE',
-            (map { "CAT_$_" } (
-                # internet
-                qw(NETWORKING_FILE_TRANSFER NETWORKING_DNS),
-                # network
-                qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE),
-                # config
-                qw(CONFIG),
-                # console
-                qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS),
-                # system
-                qw(SYSTEM MINIMAL_DOCS),
-            ))
+            # internet
+            qw(CAT_NETWORKING_FILE_TRANSFER CAT_NETWORKING_DNS),
+            # network
+            qw(CAT_NETWORKING_REMOTE_ACCESS CAT_NETWORKING_FILE),
+            # config
+            qw(CAT_CONFIG),
+            # console
+            qw(CAT_EDITORS CAT_TERMINALS CAT_TEXT_TOOLS CAT_SHELLS CAT_FILE_TOOLS),
+            # system
+            qw(CAT_SYSTEM CAT_MINIMAL_DOCS),
         ],
-        compssListLevel => 5,
+        rpmsrate_level => 5,
 
         include_packages => [
             # Satisfy the basesystem bootloader requirement.
@@ -84,8 +83,8 @@ my $_l = {
             # Not wanted
             'hunspell-dictionary',
         ],
-        preferred_packages => [
-        ],
+#       preferred_packages => [
+#       ],
         local_repo_packages => [
             # core
             'broadcom-bcma-config',
@@ -102,8 +101,8 @@ my $_l = {
             # Slows down basic usage and install, reenabled after install.
             qw(crond msec),
         ],
-        disable_timers => [
-        ],
+#       disable_timers => [
+#       ],
         files => [
             # Clean configuration files.
             [ 'files/empty.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
@@ -132,8 +131,8 @@ my $_l = {
             "/var/lib/dbus/machine-id",
             "/etc/ssh/ssh_host_*",
         ],
-        patches => [
-        ],
+#       patches => [
+#       ],
         final_fixes => join(';',
             # Enable the set-lang-kbd service.
             "systemctl enable set-lang-kbd.service",
@@ -146,19 +145,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),
@@ -175,7 +168,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',
@@ -187,6 +180,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(),
 };
diff --git a/examples/minimal/config/settings.cfg b/examples/minimal/config/settings.cfg
index a843ac7..8a531c9 100644
--- a/examples/minimal/config/settings.cfg
+++ b/examples/minimal/config/settings.cfg
@@ -1,7 +1,7 @@
 vendor=Custom
 distro=Mageia
 product=Live
-desktop=Minimal
+type=Minimal
 version=6
 arch=x86_64
 region=all
diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg
index 6b180cc..d6faa3c 100644
--- a/examples/xfce/config/build.cfg
+++ b/examples/xfce/config/build.cfg
@@ -23,7 +23,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',
@@ -34,27 +34,25 @@ my $_l = {
 
         rpmsrate_flags => [
             'LIVE',
-            (map { "CAT_$_" } (
-                # office
-                qw(OFFICE SPELLCHECK PIM ARCHIVING PRINTER),
-                # multimedia
-                qw(AUDIO VIDEO GRAPHICS),
-                # internet
-                qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT),
-                qw(NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS),
-                # network
-                qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE),
-                # config
-                qw(CONFIG),
-                # console
-                qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS),
-                # system
-                qw(SYSTEM MINIMAL_DOCS X ACCESSIBILITY THEMES),
-                # desktop
-                qw(XFCE),
-            ))
+            # office
+            qw(CAT_OFFICE CAT_SPELLCHECK CAT_PIM CAT_ARCHIVING CAT_PRINTER),
+            # multimedia
+            qw(CAT_AUDIO CAT_VIDEO CAT_GRAPHICS),
+            # internet
+            qw(CAT_NETWORKING_WWW CAT_NETWORKING_MAIL CAT_NETWORKING_NEWS CAT_COMMUNICATIONS CAT_NETWORKING_CHAT),
+            qw(CAT_NETWORKING_FILE_TRANSFER CAT_NETWORKING_IRC CAT_NETWORKING_INSTANT_MESSAGING CAT_NETWORKING_DNS),
+            # network
+            qw(CAT_NETWORKING_REMOTE_ACCESS CAT_NETWORKING_FILE),
+            # config
+            qw(CAT_CONFIG),
+            # console
+            qw(CAT_EDITORS CAT_TERMINALS CAT_TEXT_TOOLS CAT_SHELLS CAT_FILE_TOOLS),
+            # system
+            qw(CAT_SYSTEM CAT_MINIMAL_DOCS CAT_X CAT_ACCESSIBILITY CAT_THEMES),
+            # desktop
+            qw(CAT_XFCE),
         ],
-        compssListLevel => 5,
+        rpmsrate_level => 5,
 
         include_packages => [
             # Satisfy the basesystem bootloader requirement.
@@ -91,8 +89,8 @@ my $_l = {
             # No distribution license.
             'flash-player-plugin',
         ],
-        preferred_packages => [
-        ],
+#       preferred_packages => [
+#       ],
         local_repo_packages => [
             # core
             'broadcom-bcma-config',
@@ -110,6 +108,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",
@@ -118,20 +118,18 @@ my $_l = {
             "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' /etc/inittab",
         ),
 
-        langs_always => [ 'en_US' ],
-
-        additional_media => [
+#       additional_media => [
 #           {
 #               name => '',
 #               path => '',
 #               packages => [
 #               ],
 #           },
-        ],
-        rpms => [
-        ],
-        erase_rpms => [
-        ],
+#       ],
+#       rpms => [
+#       ],
+#       erase_rpms => [
+#       ],
         disable_services => [
             # Uncommon hardware.
             qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd),
@@ -140,8 +138,8 @@ my $_l = {
             # Slows down basic usage and install, reenabled after install.
             qw(crond msec),
         ],
-        disable_timers => [
-        ],
+#       disable_timers => [
+#       ],
         files => [
             # Clean configuration files.
             [ 'files/empty.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
@@ -186,8 +184,8 @@ my $_l = {
             "/var/lib/dbus/machine-id",
             "/etc/ssh/ssh_host_*",
         ],
-        patches => [
-        ],
+#       patches => [
+#       ],
         final_fixes => join(';',
             # Add a desktop icon to run draklive-install.
             "mkdir -p /home/$default_user/Desktop",
@@ -220,19 +218,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),
@@ -249,7 +241,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',
@@ -261,6 +253,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(),
 };