adapt for Mageia naming scheme (https://wiki.mageia.org/en/Product_naming)

1 files changed, 13 insertions, 13 deletions

diff --git a/config/live.cfg b/config/live.cfg
index e9dd2b6..e1d4e37 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -6,7 +6,7 @@ my @user_config_dirs = ('/etc/skel', if_($live->{settings}{default_user}, '/home
 
 sub build_one_label {
 	my ($live) = @_;
-	
+
         my ($version, $extra) =  split(/-/, $live->{settings}{version});
 	$version .= "S" if ($extra eq 'spring');
 	"LABEL=" . join ("-", ucfirst($live->{settings}{product}), $version, $live->{settings}{desktop});
@@ -42,11 +42,11 @@ my $_l = {
             ),
             #- make cups the default spooler
             [ 'files/defaultspooler', '/etc/foomatic/defaultspooler', { mode => 0644 } ],
-            if_($live->{settings}{media} eq 'cdrom',
+            if_($live->{settings}{media} eq 'CD',
                 #- eject eject cd medium before halt/reboot
-                [ 'files/halt.local.cdrom', '/sbin/halt.local', { mode => 0755 } ],
+                [ 'files/halt.local.CD', '/sbin/halt.local', { mode => 0755 } ],
                 #- do not load usblp and trigger autosetupprintqueues in live since cups is not available
-                [ 'files/live.modprobe.cdrom', '/etc/modprobe.d/live', { mode => 0644, no_install => 1 } ],
+                [ 'files/live.modprobe.CD', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
             ),
             if_($live->{settings}{media} ne 'usb', #- FIXME
                 #- umount tmp rpm hack before /etc/init.d/halt tries and fails
@@ -118,7 +118,7 @@ my $_l = {
             qw(hcfpci hsf slmodemd),
             qw(portmap nfs-common),
             qw(kav4ws freshclam clamd),
-	    if_($live->{settings}{media} eq 'cdrom', preload), 
+	    if_($live->{settings}{media} eq 'CD', preload), 
         ],
         vga_mode => 788,
         gfxboot => $live->{settings}{media} ne 'usb', #- disable gfxboot on USB, buggy with grub on some systems
@@ -213,23 +213,23 @@ my $_l = {
         #- the "all" region has a magical behavior and selects all langs
         int => [qw(de en es fr it pl pt_BR ru)],
         guadec => [qw(de en es fr it nb nn nl pl pt_BR ro ru tr)],
-        'europe-americas' => [qw(bg cs da de el en es et fi fr hr hu it ky lt lv nb nl nn no pl pt pt_BR ro ru sv tr uk uz)],
+        'Europe-Americas' => [qw(bg cs da de el en es et fi fr hr hu it ky lt lv nb nl nn no pl pt pt_BR ro ru sv tr uk uz)],
         #'africa-asia' => [qw(de en es fr it nb nn nl pl pt_BR ro ru tr ar he hi id ko ms zu ja zh_CN zh_TW)],
-        'africa-asia' => [qw(aa af am ar as ber bn ha he hi id ig ja kn ko ks ml mr or pa sd ta th tn ts ve vi xh yo zh_CN zh_TW zu)],
-        'europe1-americas' => [qw(de el en es fr it nl pt pt_BR tr)],
-        'europe2' => [qw(bg cs da et fi hr hu lt lv nb no nn pl ro ru sv uk uz)],
-        'africa-india' => [qw(zu aa af am ar as ber bn ha he hi ig kn ks ml mr or pa sd ta tn ts ve xh yo)],
-        'asia-noindia' => [qw(id ja ko th vi zh_CN zh_TW)],
+        'Africa-Asia' => [qw(aa af am ar as ber bn ha he hi id ig ja kn ko ks ml mr or pa sd ta th tn ts ve vi xh yo zh_CN zh_TW zu)],
+        'Europe1-Americas' => [qw(de el en es fr it nl pt pt_BR tr)],
+        'Europe2' => [qw(bg cs da et fi hr hu lt lv nb no nn pl ro ru sv uk uz)],
+        'Africa-India' => [qw(zu aa af am ar as ber bn ha he hi ig kn ks ml mr or pa sd ta tn ts ve xh yo)],
+        'Asia-Noindia' => [qw(id ja ko th vi zh_CN zh_TW)],
     },
     packs => {
         int => [ map { "i18n-$_" } qw(de en es fi fr it nl pt sv) ],
         da => [ map { "i18n-$_" } qw(da en) ],
     },
-    if_($live->{settings}{media} eq 'cdrom',
+    if_($live->{settings}{media} eq 'CD',
         media => {
             storage => 'cdrom',
             boot_entries => [ "" => "", "linux" => " install", "harddisk" => "" ],
-            if_($live->{settings}{product} =~ /livecd/i,
+            if_($live->{settings}{product} =~ /LiveCD/i,
                 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 uhci_hcd ohci_hcd ehci_hcd) ],