summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/auto_inst.cfg.pl8
-rw-r--r--config/live.cfg26
-rw-r--r--config/settings-livecd.cfg6
-rw-r--r--files/finish-install.CD (renamed from files/finish-install.cdrom)0
-rwxr-xr-xfiles/halt.local.CD (renamed from files/halt.local.cdrom)0
-rw-r--r--files/live.modprobe.CD (renamed from files/live.modprobe.cdrom)0
-rwxr-xr-xtools/build_live.sh2
7 files changed, 21 insertions, 21 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 5bc6efd..fdf9101 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -96,13 +96,13 @@ $o = {
#- (the br package require locales-fr so it is auto-selected if fr is available)
'libreoffice-langpack-br',
),
- if_($ENV{DRAKLIVE_REGION} !~ /\b(all|int|europe1)\b/,
+ if_($ENV{DRAKLIVE_REGION} !~ /\b(all|int|Europe1)\b/,
'kde-l10n-en_GB', 'firefox-en_GB', 'myspell-en_GB',
),
- if_($ENV{DRAKLIVE_REGION} !~ /\b(all|int|americas)\b/,
+ if_($ENV{DRAKLIVE_REGION} !~ /\b(all|int|Americas)\b/,
'kde-l10n-en_US', 'myspell-en_US',
),
- if_($ENV{DRAKLIVE_REGION} !~ /\b(all|int|americas|europe1)\b/,
+ if_($ENV{DRAKLIVE_REGION} !~ /\b(all|int|Americas|Europe1)\b/,
'libreoffice-langpack-en',
'autocorr-en', 'hunspell-en', 'hyphen-en', 'mythes-en',
'/^firefox-en_/',
@@ -123,7 +123,7 @@ $o = {
'ekiga',
'kdeaccessibility4',
if_(!$has_gnome, 'gnome-media', 'yelp', 'pinentry-gtk2', 'polkit-gnome', 'seahorse', 'totem-mozilla'),
- if_($ENV{DRAKLIVE_REGION} eq 'europe2', 'gimp'),
+ if_($ENV{DRAKLIVE_REGION} eq 'Europe2', 'gimp'),
),
($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i
? ('/openjdk/', 'java-1.5.0-gcj')
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) ],
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index 144db44..46889e5 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -3,11 +3,11 @@ updates_repository=http://repository.mageia.org/distrib/cauldron
additional_repository=
arch=i586
desktop=KDE4
-media=cdrom
+media=CD
region=int
pack=
-name=mageia
-product=livecd
+name=Mageia
+product=LiveCD
version=2-alpha1
commercial=0
default_user=live
diff --git a/files/finish-install.cdrom b/files/finish-install.CD
index fed1dd5..fed1dd5 100644
--- a/files/finish-install.cdrom
+++ b/files/finish-install.CD
diff --git a/files/halt.local.cdrom b/files/halt.local.CD
index 1e9fc67..1e9fc67 100755
--- a/files/halt.local.cdrom
+++ b/files/halt.local.CD
diff --git a/files/live.modprobe.cdrom b/files/live.modprobe.CD
index 5bb2345..5bb2345 100644
--- a/files/live.modprobe.cdrom
+++ b/files/live.modprobe.CD
diff --git a/tools/build_live.sh b/tools/build_live.sh
index 0444eff..ba47593 100755
--- a/tools/build_live.sh
+++ b/tools/build_live.sh
@@ -12,7 +12,7 @@ archs="i586"
#archs="i586 x86_64"
desktops="KDE4 GNOME"
#desktops="KDE4"
-regions="europe1-americas europe2 africa-india asia-noindia"
+regions="Europe1-Americas Europe2 Africa-India Asia-Noindia"
#regions="int"
#regions="europe1-americas"
generated by cgit v1.2.1 (git 2.21.0) at 2024-05-30 16:43:00 +0000