summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-18 11:22:10 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-18 11:22:10 +0000
commit2f67ead989a9e817ca2273315f8d4ab9fbaacc33 (patch)
tree1da7195d9f3833bf0e409bad01c180368c728d48
parenta0015e6f4736e1cfd8e79a2329714a05b268d5eb (diff)
downloaddrakx-2f67ead989a9e817ca2273315f8d4ab9fbaacc33.tar
drakx-2f67ead989a9e817ca2273315f8d4ab9fbaacc33.tar.gz
drakx-2f67ead989a9e817ca2273315f8d4ab9fbaacc33.tar.bz2
drakx-2f67ead989a9e817ca2273315f8d4ab9fbaacc33.tar.xz
drakx-2f67ead989a9e817ca2273315f8d4ab9fbaacc33.zip
fix detecting firewire controllers when using the new kernel firewire stack
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ad81bda23..f7b74b4c6 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,7 @@
o enable to set bootloader password in high security level
- harddrake
o fix displaying empty info for USB discs
+ o fix detecting firewire controllers with newer kernels
o guess real vendor names for SCSI discs like we do for IDE devices
Version 13.4 - 7 January 2009
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index f80ed5da1..1e801adc7 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -101,7 +101,7 @@ our @tree =
string => N("Firewire controllers"),
icon => "usb.png",
configurator => "",
- detector => sub { f(grep { $_->{driver} =~ /ohci1394/ } @devices) },
+ detector => sub { f(grep { $_->{driver} =~ /firewire_ohci|ohci1394/ } @devices) },
checked_on_boot => 1,
},