summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-16 09:42:00 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-16 09:42:00 +0000
commit460be76d834180eebdb5e3440a0e020c6796025c (patch)
tree9a527e842e3d41b73b21755cc19df9a8d1fb3774
parent28f2171c0bdf3ae01d356181f88f27093eb71c9f (diff)
downloaddrakx-460be76d834180eebdb5e3440a0e020c6796025c.tar
drakx-460be76d834180eebdb5e3440a0e020c6796025c.tar.gz
drakx-460be76d834180eebdb5e3440a0e020c6796025c.tar.bz2
drakx-460be76d834180eebdb5e3440a0e020c6796025c.tar.xz
drakx-460be76d834180eebdb5e3440a0e020c6796025c.zip
fix autoconfiguring synaptics (eg: on globetrotter)
-rw-r--r--perl-install/harddrake/autoconf.pm3
-rw-r--r--perl-install/modules.pm2
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index 061d738af..d0ed4f530 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -28,7 +28,8 @@ sub mouse_conf {
my ($modules_conf) = @_;
require do_pkgs;
require mouse;
- mouse::write_conf(do_pkgs_standalone->new, $modules_conf, mouse::detect($modules_conf), 1);
+ mouse::write_conf(do_pkgs_standalone->new, $modules_conf, my $mouse = mouse::detect($modules_conf), 1);
+ mouse::load_modules($mouse);
}
sub pcmcia {
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 8df2dd09f..6cb2a390b 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -191,7 +191,7 @@ sub write_preload_conf {
push @l, intersection([ list_modules::category2modules('multimedia/dvb'), list_modules::category2modules('multimedia/tv') ],
[ map { $_->{driver} } detect_devices::probeall() ]);
push @l, map { if_($_->{driver} =~ /^Module:(.*)/, $1) } detect_devices::probeall();
- push @l, 'nvram' if cat_('/proc/bus/input/devices') =~ m!^N: Name="SynPS/2 Synaptics TouchPad"$!m;
+ push @l, 'nvram', 'evdev' if cat_('/proc/bus/input/devices') =~ m!^N: Name="SynPS/2 Synaptics TouchPad"$!m;
push @l, map { $_->{driver} } probe_category('various/laptop');
push @l, map { $_->{driver} } probe_category('multimedia/joystick');
push @l, map { $_->{driver} } probe_category('various/crypto');