summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2006-03-07 11:16:05 +0000
committerFlorent Villard <warly@mandriva.com>2006-03-07 11:16:05 +0000
commit29310d76e79440c0b4fa7e89a1e2465564df998c (patch)
tree871da4178bb1f50c0ba2caff049533fc03dbd354
parent918f469c5daededba705c563155666033000708c (diff)
downloaddrakx-29310d76e79440c0b4fa7e89a1e2465564df998c.tar
drakx-29310d76e79440c0b4fa7e89a1e2465564df998c.tar.gz
drakx-29310d76e79440c0b4fa7e89a1e2465564df998c.tar.bz2
drakx-29310d76e79440c0b4fa7e89a1e2465564df998c.tar.xz
drakx-29310d76e79440c0b4fa7e89a1e2465564df998c.zip
add new rpms for bundles and rename occident in americas_western_europe
-rw-r--r--live/One/2006.0/config/live.cfg10
1 files changed, 7 insertions, 3 deletions
diff --git a/live/One/2006.0/config/live.cfg b/live/One/2006.0/config/live.cfg
index ad43ef794..6a7b87f15 100644
--- a/live/One/2006.0/config/live.cfg
+++ b/live/One/2006.0/config/live.cfg
@@ -35,8 +35,12 @@ my $l = {
# ken:/mnt/BIG/dis/2006.0/one/
'rpms/mandriva-theme-One-1.0.12-3mdk.noarch.rpm',
'rpms/mandriva-theme-One-screensaver-1.0.12-3mdk.noarch.rpm',
- ],
- erase_rpms => [
+ 'rpms/mdkonline-2.0-2mdk.noarch.rpm',
+ 'rpms/gurpmi-4.7.15-1.2.20060mdk.noarch.rpm',
+ 'rpms/urpmi-4.7.15-1.2.20060mdk.noarch.rpm',
+ 'rpms/rpmdrake-2.20-4.1.20060mdk.i586.rpm',
+ ],
+ erase_rpms => [
#'mandriva-theme', # doesn't work, the preuninstall script is buggy and completely removes the theme
'mandriva-theme-screensaver',
],
@@ -51,7 +55,7 @@ my $l = {
],
vga_mode => 788,
},
- regions => {'occident' => ['br','ca','cy','de','en_GB','en_IE','en_US','es','eu','fr','ga','gl','gn','it','iu','kl','lb','mt','nds','oc','pt','pt_BR','qu','sc','wa'],'asiafrica' => ['af','am','ar','as','az','ber','bn','fa','gu','he','hi','hy','id','ja','ka','km','kn','ko','ku','ky','lo','mi','ml','mn','mr','ms','ne','pa_IN','ph','ss','st','ta','te','tg','th','tk','tt','ug','ur','uz','uz@Latn','ve','vi','xh','zh_CN','zh_TW','zu'],'central_europe' => ['da','el','eo','fi','fo','fur','fy','is','li','nb','nl','nn','se','sv','tr'],'eastern_europe' => ['be','bg','bs','cs','et','hr','hu','lt','ltg','lv','mk','pl','ro','ru','sk','sl','sq','sr','sr@Latn','uk','yi']},
+ regions => {'americas_western_europe' => ['br','ca','cy','de','en_GB','en_IE','en_US','es','eu','fr','ga','gl','gn','it','iu','kl','lb','mt','nds','oc','pt','pt_BR','qu','sc','wa'],'asiafrica' => ['af','am','ar','as','az','ber','bn','fa','gu','he','hi','hy','id','ja','ka','km','kn','ko','ku','ky','lo','mi','ml','mn','mr','ms','ne','pa_IN','ph','ss','st','ta','te','tg','th','tk','tt','ug','ur','uz','uz@Latn','ve','vi','xh','zh_CN','zh_TW','zu'],'central_europe' => ['da','el','eo','fi','fo','fur','fy','is','li','nb','nl','nn','se','sv','tr'],'eastern_europe' => ['be','bg','bs','cs','et','hr','hu','lt','ltg','lv','mk','pl','ro','ru','sk','sl','sq','sr','sr@Latn','uk','yi']},
media => {
storage => 'cdrom',
},