--- /usr/lib/perl5/site_perl/esmith/ethernet.pm.orig Wed Jan 22 09:11:43 2003
+++ /usr/lib/perl5/site_perl/esmith/ethernet.pm Wed Jan 22 09:32:48 2003
@@ -64,32 +64,37 @@
my $kernel = (split(' ', ))[2];
close VERSION;
- my $modules = "/lib/modules/" . $kernel . "/kernel/drivers/net";
- unless (-d $modules)
- {
- # Also handle 2.2.x kernels
- $modules = "/lib/modules/" . $kernel . "/net";
- }
-
- unless (opendir MODULES, $modules)
- {
- warn "Could not open network modules directory $modules: $!\n";
- return;
- }
+ my @modules_path = (
+ "/lib/modules/" . $kernel . "/net",
+ "/lib/modules/" . $kernel . "/kernel/drivers/net",
+ "/lib/modules/" . $kernel . "/kernel/drivers/addon/e100",
+ "/lib/modules/" . $kernel . "/kernel/drivers/addon/e1000"
+ );
my %network_drivers;
-
- foreach (readdir MODULES)
+ foreach my $modules (@modules_path)
{
- next if /^\.\.?$/; # Ignore "." and ".."
- next if -d; # Ignore directories
+ if (-d $modules)
+ {
+ unless (opendir MODULES, $modules)
+ {
+ warn "Could not open network modules directory $modules: $!\n";
+ return;
+ }
+
+ foreach (readdir MODULES)
+ {
+ next if /^\.\.?$/; # Ignore "." and ".."
+ next if -d; # Ignore directories
+
+ s/\.o$//;
+ ++$network_drivers{$_};
+ }
- s/\.o$//;
- ++$network_drivers{$_};
+ closedir MODULES;
+ }
}
- closedir MODULES;
-
my $pcitable = "/usr/share/hwdata/pcitable";
unless (open(PCITABLE, $pcitable) ||
--
Damien