- prefer versioned firmware first

svn-id: @10353

diff --git a/geninitrd b/geninitrd
index 65ef5eead0658a7d7a656d1f572595fa1ad51e10..9a79aa5bbd64905df0a7e10cc4bcd1fd741cbf51 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -572,16 +572,16 @@ EOF
        fi
 
        for firmware in $firmware_files; do
-               if [ -f "/lib/firmware/$firmware" ]; then
+               if [ -f "/lib/firmware/$kernel/$firmware" ]; then
                        FIRMWAREDIR=${firmware%/*}
                        [ "$FIRMWAREDIR" != "$firmware" ] && inst_d /lib/firmware/$FIRMWAREDIR
-                       inst /lib/firmware/$firmware /lib/firmware/$firmware
-               elif [ -f "/lib/firmware/$kernel/$firmware" ]; then
+                       inst /lib/firmware/$kernel/$firmware /lib/firmware/$firmware
+               elif [ -f "/lib/firmware/$firmware" ]; then
                        FIRMWAREDIR=${firmware%/*}
                        [ "$FIRMWAREDIR" != "$firmware" ] && inst_d /lib/firmware/$FIRMWAREDIR
-                       inst /lib/firmware/$kernel/$firmware /lib/firmware/$firmware
+                       inst /lib/firmware/$firmware /lib/firmware/$firmware
                else
-                       die "firmware file /lib/firmware/$firmware nor /lib/firmware/$kernel/$firmware doesn't exist."
+                       die "firmware file /lib/firmware/$firmware nor /lib/firmware/$kernel/$firmware found."
                fi
        done