summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-09-25 14:24:18 +0000
committerdamien <damien@mandriva.com>2000-09-25 14:24:18 +0000
commitc74b22517acebac89a4fe064b04283b8caf2bbc5 (patch)
tree1194e9853c6fde3a69b13e051f978e478b76ca14
parent425b631705c0da0809622e7342049b95cdc59789 (diff)
downloaddrakx-backup-do-not-use-c74b22517acebac89a4fe064b04283b8caf2bbc5.tar
drakx-backup-do-not-use-c74b22517acebac89a4fe064b04283b8caf2bbc5.tar.gz
drakx-backup-do-not-use-c74b22517acebac89a4fe064b04283b8caf2bbc5.tar.bz2
drakx-backup-do-not-use-c74b22517acebac89a4fe064b04283b8caf2bbc5.tar.xz
drakx-backup-do-not-use-c74b22517acebac89a4fe064b04283b8caf2bbc5.zip
stc
-rw-r--r--perl-install/ChangeLog7
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
3 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 256214406..b4a7f7d0c 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-25 dam's <damien@mandrakesoft.com>
+
+ * netconnect.pm (read_net_conf): created. draknet now stores and
+ reload the config.
+ * netconnect.pm (main): if the user is french and uses french
+ keyboard, don't ask his country.
+
2000-09-25 Pixel <pixel@mandrakesoft.com>
* modules.pm: added 8139too
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index b63985024..92e8049f4 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1027,7 +1027,7 @@ sub show_info {
#- Program entry point.
sub main {
my ($o, $allowFB);
- ($prefix, $o, $in, $allowFB, $isLaptop, $install) = @_;
+ ($prefix, $o, $in, $allowFB, $isLaptop, $install, $lang) = @_;
$o ||= {};
XF86check_link('');
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2c35a4e9e..af26cb58c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -516,7 +516,7 @@ sub configureNetwork {
my ($o, $first_time) = @_;
require netconnect;
netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{pcmcia}, $o->{intf},
- sub { $o->pkg_install(@_) }, $first_time);
+ sub { $o->pkg_install(@_) }, $first_time, $o->{lang} eq "fr_FR" && $o->{keyboard} eq "fr");
}
#-configureNetworkIntf moved to network