summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-06 21:51:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-06 21:51:26 +0000
commit33512d7f58fab6184ea1dc21930f1d00c0e382c8 (patch)
tree373d54a6623e73fe709aa22170ba0b1f4fe0cbd5 /perl-install/install2.pm
parent6f09486fa6b42c0b3fedb48d4b8dd2e6ac52c647 (diff)
downloaddrakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar.gz
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar.bz2
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar.xz
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.zip
adapt to the fact that RPM_INSTALL_LANG is obsoloted. Now rpm uses %_install_langs in /etc/rpm/macros
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm12
1 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d6e172911..c927e0ac1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -202,7 +202,10 @@ sub selectLanguage {
$o->selectLanguage($_[1] == 1);
addToBeDone {
- lang::write($o->{prefix});
+ lang::write_langs($o->{prefix}, $o->{langs});
+ } 'formatPartitions' unless $::g_auto_install;
+ addToBeDone {
+ lang::write($o->{prefix}, $o->{lang});
keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang}));
} 'installPackages' unless $::g_auto_install;
}
@@ -240,7 +243,10 @@ sub selectKeyboard {
#- if we go back to the selectKeyboard, you must rewrite
addToBeDone {
- lang::write($o->{prefix});
+ lang::write_langs($o->{prefix}, $o->{langs});
+ } 'formatPartitions' unless $::g_auto_install;
+ addToBeDone {
+ lang::write($o->{prefix}, $o->{lang});
keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang}));
} 'installPackages' unless $::g_auto_install;
}
@@ -279,7 +285,7 @@ sub formatPartitions {
$o->formatMountPartitions($o->{fstab}) unless $::testing;
mkdir "$o->{prefix}/$_", 0755 foreach
- qw(dev etc etc/profile.d etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
+ qw(dev etc etc/profile.d etc/rpm etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
home mnt tmp var var/tmp var/lib var/lib/rpm var/lib/urpmi);
mkdir "$o->{prefix}/$_", 0700 foreach qw(root root/tmp);