diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-20 11:37:48 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-20 11:37:48 +0000 |
| commit | 21850250aa29e48bfeb3b65efee65193ea0a8e8b (patch) | |
| tree | a6cb4c1c0cd9a76fa0731f1261c975823a360f04 | |
| parent | 5b33d959969e96048068328d6f0dbc2c6ae4db4d (diff) | |
| download | drakx-backup-do-not-use-21850250aa29e48bfeb3b65efee65193ea0a8e8b.tar drakx-backup-do-not-use-21850250aa29e48bfeb3b65efee65193ea0a8e8b.tar.gz drakx-backup-do-not-use-21850250aa29e48bfeb3b65efee65193ea0a8e8b.tar.bz2 drakx-backup-do-not-use-21850250aa29e48bfeb3b65efee65193ea0a8e8b.tar.xz drakx-backup-do-not-use-21850250aa29e48bfeb3b65efee65193ea0a8e8b.zip | |
add firewire controller configuration
| -rw-r--r-- | kernel/list_modules.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 4 |
4 files changed, 7 insertions, 1 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index 865ba0e93..80212d9df 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -83,6 +83,7 @@ our %l = ( bus => { usb => [ qw(usbcore usb-uhci usb-ohci ehci-hcd usbkbd keybdev input) ], + firewire => [ qw(ohci1394) ], pcmcia => [ if_(arch() !~ /^sparc/, qw(pcmcia_core tcic ds i82365 yenta_socket)), # cb_enabler ], diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index e6d2991fc..8ed192198 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -129,6 +129,7 @@ sub setupSCSI { my ($o) = @_; modules::configure_pcmcia($o->{pcmcia}) if $o->{pcmcia}; modules::load_ide(); + modules::load_category('bus/firewire'); modules::load_category('disk/scsi|hardware_raid'); } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 35000ad15..d806b22f1 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -321,6 +321,8 @@ sub setupSCSI { my $w = $o->wait_message(_("IDE"), _("Configuring IDE")); modules::load(modules::category2modules('disk/cdrom')); } + any::load_category($o, 'bus/firewire'); + any::load_category($o, 'disk/scsi|hardware_raid', !$::expert && !$clicked, 0, $o->{pcmcia}); install_interactive::tellAboutProprietaryModules($o) if !$clicked; diff --git a/perl-install/modules.pm b/perl-install/modules.pm index bd08427b3..6167a99e8 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -343,9 +343,11 @@ sub when_load { add_probeall('scsi_hostadapter', $name); eval { load('sd_mod') }; } - add_alias('sound-slot-0', $name) if $category =~ /sound/; load('snd-pcm-oss') if $name =~ /^snd-/; + add_alias('sound-slot-0', $name) if $category =~ /sound/; + add_alias('ieee1394-controller', $name) if member($name, 'ohci1394'); add_probeall('usb-interface', $name) if $name =~ /usb-[uo]hci/ || $name eq 'ehci-hcd'; + $conf{$name}{options} = join " ", @options if @options; } |