summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2006-03-07 11:38:22 +0000
committerOlivier Blin <oblin@mandriva.org>2006-03-07 11:38:22 +0000
commit5c83b27e9a0bc17148e62ad3dbf630f8d0b57d29 (patch)
tree22fb119d5c50fb9277141b6872dfb06f3863ebb0
parentcabace537c75929847bf52bfc546e9ab56110267 (diff)
downloaddrakx-5c83b27e9a0bc17148e62ad3dbf630f8d0b57d29.tar
drakx-5c83b27e9a0bc17148e62ad3dbf630f8d0b57d29.tar.gz
drakx-5c83b27e9a0bc17148e62ad3dbf630f8d0b57d29.tar.bz2
drakx-5c83b27e9a0bc17148e62ad3dbf630f8d0b57d29.tar.xz
drakx-5c83b27e9a0bc17148e62ad3dbf630f8d0b57d29.zip
allow to add langs whatever the region
-rwxr-xr-xtools/draklive3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/draklive b/tools/draklive
index 9f0705d70..251b5ed8f 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -443,11 +443,12 @@ label live
sub install_system {
my ($live) = @_;
+ my @langs = uniq(@{$live->{regions}{$live->{system}{region}}}, @{$live->{system}{langs_always}});
run_({ timeout => 3600 },
'drakx-in-chroot',
$live->{system}{repository},
get_system_root($live),
- if_($live->{system}{region}, '--langs', join(':', @{$live->{regions}{$live->{system}{region}}})),
+ if_($live->{system}{region}, '--langs', join(':', @langs)),
if_($live->{system}{auto_install}, '--auto_install', Cwd::abs_path($live->{system}{auto_install})),
if_($live->{system}{patch_install}, '--defcfg', Cwd::abs_path($live->{system}{patch_install})),
if_($live->{system}{rpmsrate}, '--rpmsrate', Cwd::abs_path($live->{system}{rpmsrate})))