diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-11 23:21:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-11 23:21:04 +0000 |
| commit | b809fb59b049710d7510b991f3f983e85fcf9c2e (patch) | |
| tree | fc2f03e7b5acd33f17dfbb3283a85ff927cb1ece | |
| parent | fcf8e1b52fcf5e81c5548e0b77df71f4d95430e4 (diff) | |
| download | drakx-b809fb59b049710d7510b991f3f983e85fcf9c2e.tar drakx-b809fb59b049710d7510b991f3f983e85fcf9c2e.tar.gz drakx-b809fb59b049710d7510b991f3f983e85fcf9c2e.tar.bz2 drakx-b809fb59b049710d7510b991f3f983e85fcf9c2e.tar.xz drakx-b809fb59b049710d7510b991f3f983e85fcf9c2e.zip | |
- don't propose languages which do not have their clp
- mount the live_tree_i18n_LANG.clp
| -rw-r--r-- | move/move.pm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/move/move.pm b/move/move.pm index 2d072deed..951909c2d 100644 --- a/move/move.pm +++ b/move/move.pm @@ -213,6 +213,13 @@ drakx_stuff: #- don't use shadow passwords since pwconv overwrites /etc/shadow hence contents will be lost for usb key delete $o->{authentication}{shadow}; + foreach my $lang (keys %lang::langs) { + my $dir = '/usr/share/locale/' . lang::l2locale($lang); + my $link = readlink($dir) or next; + my ($name) = $link =~ m!image_(i18n_.*?)/! or log::l("ERROR: bad link $link for $dir"), next; + log::l("disabling lang $lang"); + -e "/cdrom/live_tree_$name.clp" or delete $lang::langs{$lang}; + } } sub lomount_clp { @@ -243,6 +250,7 @@ sub install2::autoSelectLanguage { sub install2::handleI18NClp { my $o = $::o; + lomount_clp("i18n_$o->{locale}{lang}", '/usr'); lomount_clp("always_i18n_$o->{locale}{lang}", '/usr'); } |