summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-06 04:24:29 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-06 04:24:29 +0000
commita8514cd2ed0b40c27c45bd001eb9d7c2e3636c9d (patch)
tree4dcff6940846047c7e87f55b76e8764710369eb5 /perl-install
parentd399d4a79c5ac51ba6700e8c0f0627fc939008aa (diff)
downloaddrakx-backup-do-not-use-a8514cd2ed0b40c27c45bd001eb9d7c2e3636c9d.tar
drakx-backup-do-not-use-a8514cd2ed0b40c27c45bd001eb9d7c2e3636c9d.tar.gz
drakx-backup-do-not-use-a8514cd2ed0b40c27c45bd001eb9d7c2e3636c9d.tar.bz2
drakx-backup-do-not-use-a8514cd2ed0b40c27c45bd001eb9d7c2e3636c9d.tar.xz
drakx-backup-do-not-use-a8514cd2ed0b40c27c45bd001eb9d7c2e3636c9d.zip
always load mouse modules at beginning of install (should fix X test
not working with synaptics during install)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm7
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 406989072..49c51649d 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -572,11 +572,8 @@ sub main {
#- needed very early for install_steps_gtk
if (!$::testing) {
- if ($o->{mouse}) {
- mouse::load_modules($o->{mouse});
- } else {
- eval { $o->{mouse} = mouse::detect($o->{modules_conf}) } if !$o->{nomouseprobe};
- }
+ eval { $o->{mouse} = mouse::detect($o->{modules_conf}) } if !$o->{mouse} && !$o->{nomouseprobe};
+ mouse::load_modules($o->{mouse});
}
$o->{locale}{lang} = lang::set($o->{locale}) if $o->{locale}{lang} ne 'en_US' && !$::move; #- mainly for defcfg