From 89e2c0f66b7aac23562cac0c22a3b71f388fe568 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 7 Jul 2004 07:21:04 +0000 Subject: modules::mergein_conf() doesn't need to be given /etc/modules.conf => prepare for reading either modprobe.conf or modules.conf based on the running kernel version --- perl-install/harddrake/data.pm | 2 +- perl-install/install2.pm | 2 +- perl-install/modules.pm | 10 +++++----- perl-install/modules/interactive.pm | 2 +- perl-install/mouse.pm | 2 +- perl-install/network/ethernet.pm | 2 +- perl-install/network/netconnect.pm | 2 +- perl-install/standalone/XFdrake | 2 +- perl-install/standalone/draksound | 2 +- perl-install/standalone/drakxtv | 2 +- perl-install/standalone/mousedrake | 2 +- perl-install/standalone/printerdrake | 2 +- perl-install/standalone/service_harddrake | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 3f4d071bc..ca1b30b40 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -260,7 +260,7 @@ our @tree = detector => sub { require mouse; require modules; - modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; + modules::mergein_conf(); &mouse::detect(); }, checked_on_boot => 1, diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 7ca1e9c17..b8f57432a 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -457,7 +457,7 @@ sub main { eval { spawnShell() }; modules::load_dependencies(($::testing ? ".." : "") . "/modules/modules.dep"); - modules::read_stage1_conf('/tmp/modules.conf'); + modules::mergein_conf_raw('/tmp/modules.conf'); modules::read_already_loaded(); #- done before auto_install is called to allow the -IP feature on auto_install file name diff --git a/perl-install/modules.pm b/perl-install/modules.pm index d8180256f..d7216cfd1 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -272,7 +272,7 @@ sub read_conf { \%c; } -sub mergein_conf { +sub mergein_conf_raw { my ($file) = @_; my $modconfref = read_conf($file); while (my ($key, $value) = each %$modconfref) { @@ -281,6 +281,10 @@ sub mergein_conf { push @{$conf{$key}{probeall} ||= []}, deref($value->{probeall}); } } +sub mergein_conf { + my $file = "$::prefix/etc/modules.conf"; + mergein_conf_raw($file) if -r $file; +} sub write_conf() { my $file = "$::prefix/etc/modules.conf"; @@ -348,10 +352,6 @@ sub append_to_modules_loaded_at_startup { } $file; } -sub read_stage1_conf { - mergein_conf($_[0]); -} - #-############################################################################### #- internal functions diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm index 51c58cc85..2faf84a0c 100644 --- a/perl-install/modules/interactive.pm +++ b/perl-install/modules/interactive.pm @@ -6,7 +6,7 @@ use common; sub config_window { my ($in, $data) = @_; require modules; - modules::mergein_conf('/etc/modules.conf'); + modules::mergein_conf(); my %conf = modules::get_parameters($data->{driver}); require modules::parameters; my @l; diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index e95a1eb3c..3d79442ca 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -567,7 +567,7 @@ mouse - Perl functions to handle mice require modules; require mouse; - modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; + modules::mergein_conf(); &mouse::detect(); =head1 DESCRIPTION diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index a6e58df1b..ea322a7f2 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -50,7 +50,7 @@ sub get_eth_cards() { my @all_cards = detect_devices::getNet(); my @devs = detect_devices::pcmcia_probe(); - modules::mergein_conf("$::prefix/etc/modules.conf"); + modules::mergein_conf(); my $saved_driver; return map { my $interface = $_; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 1a3a046ff..76a7fdba7 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -121,7 +121,7 @@ sub real_main { $netc->{NET_INTERFACE} = $netcnx->{NET_INTERFACE} if $netcnx->{NET_INTERFACE}; # REDONDANCE with read_conf. FIXME network::network::read_all_conf($::prefix, $netc, $intf); - modules::mergein_conf("$::prefix/etc/modules.conf"); + modules::mergein_conf(); $netc->{autodetect} = {}; diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index d0d977628..90a78d1b0 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -39,7 +39,7 @@ $configure_this ||= 'everything'; { my $in = 'interactive'->vnew('su'); - modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; + modules::mergein_conf() if -r '/etc/modules.conf'; my $rc = do { my $options = { allowFB => listlength(cat_("/proc/fb")) }; diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound index e52c3e518..3d5ff85e0 100755 --- a/perl-install/standalone/draksound +++ b/perl-install/standalone/draksound @@ -29,7 +29,7 @@ use detect_devices; my $in = 'interactive'->vnew('su'); -modules::mergein_conf('/etc/modules.conf'); +modules::mergein_conf(); my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_AUDIO' } detect_devices::probeall(); if (@devices) { diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index b07fee392..888815632 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -121,7 +121,7 @@ if (@devices) { if (($< == 0 || $::testing) && (grep { detect_devices::isTVcard($_) } @devices)) { require harddrake::v4l; require modules; - modules::mergein_conf('/etc/modules.conf') if !$configured; + modules::mergein_conf() if !$configured; $configured++; $not_canceled &&= harddrake::v4l::config($in, $_->{driver}); modules::write_conf(); diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index d7bb98729..19d104f95 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -13,7 +13,7 @@ use c; my $in = 'interactive'->vnew('su'); -modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; +modules::mergein_conf(); begin: my $mouse = mouse::read(); diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index 00ebf6288..aceb4940a 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -103,7 +103,7 @@ $commandline =~ /-lprng/ and $printer->{SPOOLER} = 'lprng' and printer::main::read_configured_queues($printer); $commandline =~ /-pdq/ and $printer->{SPOOLER} = 'pdq' and printer::main::read_configured_queues($printer); --r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf'); +modules::mergein_conf(); undef $w; diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index de5eede6a..1cd03cc43 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -20,7 +20,7 @@ my $last_boot_config = $hw_sysconfdir."/previous_hw"; $last_boot_config .= '_X11' if $invert_do_it; -modules::mergein_conf('/etc/modules.conf'); +modules::mergein_conf(); # autoreconfigure the mouse on major kernel change: my $prev_kernel = { getVarsFromSh("$hw_sysconfdir/kernel") }->{KERNEL}; -- cgit v1.2.1