summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-09-10 07:11:42 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-09-10 07:11:42 +0000
commit6ca815e61043d9c0f86d9ef08f8a2e221aba8ccf (patch)
tree1c0bd1857716df8ccfa3ea395ddaef8a11d1bc17
parent512f9dd7aef126b0bb7d36ecb9ed27f863f82d2f (diff)
downloaddrakx-6ca815e61043d9c0f86d9ef08f8a2e221aba8ccf.tar
drakx-6ca815e61043d9c0f86d9ef08f8a2e221aba8ccf.tar.gz
drakx-6ca815e61043d9c0f86d9ef08f8a2e221aba8ccf.tar.bz2
drakx-6ca815e61043d9c0f86d9ef08f8a2e221aba8ccf.tar.xz
drakx-6ca815e61043d9c0f86d9ef08f8a2e221aba8ccf.zip
cleanups
-rw-r--r--perl-install/harddrake/autoconf.pm1
-rwxr-xr-xperl-install/standalone/service_harddrake8
2 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index e2e48b27c..91ec054d9 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -26,7 +26,6 @@ sub network_conf {
sub mouse_conf {
my ($modules_conf) = @_;
- log::explanations("Autoconfiguring mouse since we switched between 2.4.x and 2.6.x kernels");
require do_pkgs;
require mouse;
mouse::write_conf(do_pkgs_standalone->new, $modules_conf, mouse::detect($modules_conf), 1);
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index dc230a540..0c653b9bc 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -10,6 +10,7 @@ use common;
use interactive;
use detect_devices;
use harddrake::data;
+use harddrake::autoconf;
use harddrake::sound;
use modules;
use Storable qw(store retrieve);
@@ -30,7 +31,10 @@ my $prev_kernel = { getVarsFromSh("$hw_sysconfdir/kernel") }->{KERNEL};
my $curr_kernel = c::kernel_version();
$curr_kernel =~ s/(^\d+\.\d+).*/$1/;
setVarsInSh("$hw_sysconfdir/kernel", { KERNEL => $curr_kernel });
-harddrake::autoconf::mouse_conf($modules_conf) if $curr_kernel ne $prev_kernel;
+if ($curr_kernel ne $prev_kernel) {
+ log::explanations("Autoconfiguring mouse since we switched between 2.4.x and 2.6.x kernels");
+ harddrake::autoconf::mouse_conf($modules_conf) ;
+}
if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) {
if (find { -e join('', "/lib/modules/", c::kernel_version(), "/kernel/drivers/$_") } map { ("video/$_", "char/$_") } qw(NVdriver nvidia.o nvidia.o.gz nvidia.ko nvidia.ko.gz)) {
@@ -125,11 +129,11 @@ foreach my $hw_class (@harddrake::data::tree) {
modules::load_category($modules_conf, 'bus/usb');
$modules_conf->write;
} elsif ($Ident eq "VIDEO") {
- require harddrake::autoconf;
harddrake::autoconf::xconf($modules_conf, {});
next;
} elsif ($Ident eq "MOUSE") {
harddrake::autoconf::mouse_conf($modules_conf);
+ next;
}
next if $is_globetrotter && !$hw_class->{automatic};