- rel 4; fix mod-sata finding too much bug

Changed files:
    geninitrd-svn.patch -> 2.3
    geninitrd.spec -> 2.179

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index c51766514826719270937e253824299ea2ca9c1e..89b8106c6f9055af841fa39b828a1cecc52677d7 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -27,3 +27,30 @@ Index: geninitrd
                        fi
                        if [ -n "$rootnr" ]; then
                                echo "$rootnr" > /proc/sys/kernel/real-root-dev
+Index: mod-sata.sh
+===================================================================
+--- mod-sata.sh        (wersja 12194)
++++ mod-sata.sh        (kopia robocza)
+@@ -17,7 +17,7 @@
+ 
+ # private until only mod-sata uses the function
+ find_modules_by_class() {
+-      local class=$1
++      local req_class=$1
+ 
+       # no pcimap, nothing to lookup from
+       if [ ! -f "$pcimap" ]; then
+@@ -28,10 +28,12 @@
+               return
+       fi
+ 
+-      set -- $($lspci -n | awk -vclass=$class '$2 == class":" {split($3, p, ":"); printf("0x0000%s 0x0000%s\n", p[1], p[2])}')
++      set -- $($lspci -n | awk -vclass=$req_class '$2 == class":" {split($3, p, ":"); printf("0x0000%s 0x0000%s\n", p[1], p[2])}')
+ 
+       local PCI_ANY_ID=0x0000ffff pci_module vendor device subvendor subdevice class class_mask driver_data
+       while read pci_module vendor device subvendor subdevice class class_mask driver_data; do
++              # match class
++              [ "$(($req_class & $class_mask))" = "$class" ] || continue
+               # match vendor
+               [ "$1" = "$vendor" ] || continue
+               # match device, allow PCI_ANY_ID

diff --git a/geninitrd.spec b/geninitrd.spec
index 686bcb61b22c4598ed273e3a1d70b70170eb2593..d1012e69ad28c2568f0e061223115a02ef7a4f55 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -8,7 +8,7 @@ Summary(pl.UTF-8):      Narzędzie do tworzenia inicjalnego ramdysku używanego przy
 Name:          geninitrd
 Version:       10000.32
 # leave rel 1 for ac
-Release:       4
+Release:       5
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz