summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-02-27 19:19:02 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-02-27 19:19:02 +0000
commitb0278853f4ba4296e954241bd3cbed3302d0b0d5 (patch)
tree689bc74cfbf34b134f95798d77a67a16e1ec1bd1
parentd23d3f83976f6cf5678f270009488e09c4b8c51c (diff)
downloaddrakx-b0278853f4ba4296e954241bd3cbed3302d0b0d5.tar
drakx-b0278853f4ba4296e954241bd3cbed3302d0b0d5.tar.gz
drakx-b0278853f4ba4296e954241bd3cbed3302d0b0d5.tar.bz2
drakx-b0278853f4ba4296e954241bd3cbed3302d0b0d5.tar.xz
drakx-b0278853f4ba4296e954241bd3cbed3302d0b0d5.zip
add ieee1394-controller alias and load ohci1394 when a firewire controller appeared
-rw-r--r--perl-install/harddrake/data.pm2
-rwxr-xr-xperl-install/standalone/service_harddrake1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 7a1d777e2..402e49903 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -72,7 +72,7 @@ our @tree =
[ "JOYSTICK", , N("Joystick"), "joystick.png", "", sub {}, 0 ],
[ "ATA_STORAGE", , N("(E)IDE/ATA controllers"), "ide_hd.png", "", sub { grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices }, 0 ],
- [ "FIREWIRE_CONTROLLER", , N("Firewire controllers"), "usb.png", "", sub { grep { $_->{driver} =~ /ohci1394/ } @devices }, 0 ],
+ [ "FIREWIRE_CONTROLLER", , N("Firewire controllers"), "usb.png", "", sub { grep { $_->{driver} =~ /ohci1394/ } @devices }, 1 ],
[ "SCSI_CONTROLLER", , N("SCSI controllers"), "scsi.png", "", sub { grep { $_->{media_type} =~ /STORAGE_SCSI/ } @devices }, 0 ],
[ "USB_CONTROLLER", , N("USB controllers"), "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_USB|Hub/ } @devices }, 0 ],
[ "SMB_CONTROLLER", , N("SMBus controllers"), "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_SMBUS/ } @devices }, 0 ],
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 9a6a26e34..1481eafca 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -51,6 +51,7 @@ foreach (@harddrake::data::tree) {
my @added = difference2([ keys %ID ], [ keys %$oldconfig ]);
$msg .= N("Some devices were added:\n", $item) if @added;
$msg .= "- " . harddrake::data::custom_id($ID{$_}, $item) . " was added\n" foreach @added;
+ modules::load('ohci1394') if $Ident eq 'FIREWIRE_CONTROLLER' && any { $_->{driver} eq 'ohci1394' } @added;
@added || @was_removed or next;
harddrake::data::set_removable_configurator($Ident, first(values %$oldconfig, values %ID), \$configurator);
next unless -x first(split /\s+/, $configurator);