Sophie

Sophie

distrib > Arklinux > devel > x86_64 > by-pkgid > 5b940e974faae500b8be8331a3cc5064 > files > 14

mkinitrd-5.0.17-24ark.src.rpm

--- mkinitrd-5.0.17/mkinitrd.usbfalsepositive~	2008-04-18 09:27:30.000000000 +0200
+++ mkinitrd-5.0.17/mkinitrd	2008-04-18 09:30:50.000000000 +0200
@@ -600,6 +600,14 @@
             # The right thing to do(tm) is figuring out the host ID and
             # checking for /proc/scsi/usb-storage-$hostid or
             # /proc/scsi/usb-storage/$host
+            #
+            # Temporary better than nothing workaround:
+            # /sys/class/block/$dev/vendor reports ATA for SATA...
+            # Starting with kernel 2.6.25-rc9, this has been renamed to
+            # /sys/class/block/$dev/device/vendor, so make sure we check both
+            if grep -q ATA /sys/class/block/$dev/vendor /sys/class/block/$dev/device/vendor 2>/dev/null; then
+                continue
+            fi
             if [ -d /proc/scsi/usb-storage ]; then
                 needusb=1
             fi