summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/pcmcia_/merge_from_pcitable
diff options
context:
space:
mode:
authorNicolas Planel <nplanel@mandriva.com>2003-10-29 16:07:11 +0000
committerNicolas Planel <nplanel@mandriva.com>2003-10-29 16:07:11 +0000
commitde47eb59bb829423b1d0f47ba13099073999b3cb (patch)
tree827f35c4666e15ec66edae7c1fa05d963324602b /mdk-stage1/pcmcia_/merge_from_pcitable
parent1fece42e9c460ca017fc4facad380f05163d8977 (diff)
downloaddrakx-backup-do-not-use-de47eb59bb829423b1d0f47ba13099073999b3cb.tar
drakx-backup-do-not-use-de47eb59bb829423b1d0f47ba13099073999b3cb.tar.gz
drakx-backup-do-not-use-de47eb59bb829423b1d0f47ba13099073999b3cb.tar.bz2
drakx-backup-do-not-use-de47eb59bb829423b1d0f47ba13099073999b3cb.tar.xz
drakx-backup-do-not-use-de47eb59bb829423b1d0f47ba13099073999b3cb.zip
Corporate Server 2.1.1 releasetopic/Corpo_2_1
Diffstat (limited to 'mdk-stage1/pcmcia_/merge_from_pcitable')
-rwxr-xr-xmdk-stage1/pcmcia_/merge_from_pcitable6
1 files changed, 3 insertions, 3 deletions
diff --git a/mdk-stage1/pcmcia_/merge_from_pcitable b/mdk-stage1/pcmcia_/merge_from_pcitable
index 74fc56f31..27cda239b 100755
--- a/mdk-stage1/pcmcia_/merge_from_pcitable
+++ b/mdk-stage1/pcmcia_/merge_from_pcitable
@@ -41,9 +41,9 @@ print "Missing in pcitable:\n";
foreach my $p (@probes) {
my @r = grep { $_->{vd} eq $p->{vd} } @pcitable;
@r > 1 and die "duplicate entry in pcitable <$p->{vd}>\n";
- if (@r && $r[0]->{driver} ne 'yenta_socket') {
- push @res, "0x$p->{vendor}\t0x$p->{device}\t\"yenta_socket\"\t\"$r[0]->{name}\"\n";
- $r[0]->{driver} ne 'unknown' and print STDERR "WARNING, driver for <$p->{vd}> was <$r[0]->{driver}>\n";
+ if (!@r || @r && $r[0]->{driver} ne 'yenta_socket') {
+ push @res, "0x$p->{vendor}\t0x$p->{device}\t\"yenta_socket\"\t\"" . (@r ? $r[0]->{name} : '(COMPLETELY MISSING)') . "\"\n";
+ @r and $r[0]->{driver} ne 'unknown' and print STDERR "WARNING, driver for <$p->{vd}> was <$r[0]->{driver}>\n";
}
}
print sort @res;