Bug#335264: yaird fails with older (titanium) powerbooks.

[Sven Luther <luther@debian.org>]

Package: yaird
Version: 0.0.11-6
Severity: normal
Tags: patch


Hi, ...

On my titanium powerbook, yaird fails with : 

 yaird error: unrecognised device: /sys/devices/pci0001:10/0001:10:17.0/0.80000000:mac-io
 yaird error: unrecognised device: /sys/devices/pci0001:10/0001:10:17.0/0.80000000:mac-io/0.0001f000:ata-4

Well, those are non-fatal errors, and the mac-io is just a super-controller
kind of thingy sitting on the pci bus, and holding the ata-* devices, which in
turn have ide0 or ide1 subdirs, which are the ones given in the path.

Now, there are two problems, first is that we should harmlessly recognize
those above, provided in the attached patch, well not sure about the exact
syntax of the comment, but this should do, and i added a small typo-fixing in
the above comment :).

The second problem is that since the initrd is generated correctly, those
non-harmfull errors should maybe not cause mkinitrd.yaird to return and error
code of 1 and thus fail, not sure though.

Friendly,

Sven Luther

-- System Information:
Debian Release: 3.1
Architecture: powerpc (ppc)
Kernel: Linux 2.6.12-1-powerpc
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)

--- /usr/lib/yaird/perl/Hardware.pm.orig	2005-10-23 00:35:19.000000000 +0200
+++ /usr/lib/yaird/perl/Hardware.pm	2005-10-23 01:30:01.000000000 +0200
@@ -36,7 +36,7 @@
 
 
 #
-# moduleList -- given a path relativwe to /sys/devices,
+# moduleList -- given a path relative to /sys/devices,
 # return a list of the modules needed to activate it.
 #
 sub moduleList ($) {
@@ -73,6 +73,12 @@
 		elsif ($abspath =~ m!/ide\d+$!) {
 			# IDE bus; harmless
 		}
+		elsif ($abspath =~ m!/.*:mac-io$!) {
+			# PowerMac super-io controller; harmless
+		}
+		elsif ($abspath =~ m!/.*:ata-\d+$!) {
+			# PowerMac ata controller; harmless
+		}
 		elsif ($abspath =~ m!/ide\d+/\d+\.\d+$!) {
 			# IDE device
 			my $dev = IdeDev->new (path => $abspath);