Author: glen
Date: Sun May 3 19:56:21 2009
New Revision: 10353
Modified:
geninitrd/trunk/geninitrd
Log:
- prefer versioned firmware first
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Sun May 3 19:56:21 2009
@@ -572,16 +572,16 @@
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
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
