On Wed, Apr 10, 2013 at 6:35 AM, Johannes Berg
<johannes@xxxxxxxxxxxxxxxx> wrote:
> On Wed, 2013-04-10 at 04:35 -0700, Luis R. Rodriguez wrote:
>> +rm -f $BLACKLIST_CONF
>> +
>> +echo "# To be used when using backported drivers" >> $BLACKLIST_CONF
>
> Or you could just use > instead of >> on this first line ;-)
Doh, yes.
>> +for i in $(grep -v ^# $BLACKLIST_MAP | cut -f 2); do
>
> What happens if the blacklist map contains empty lines? Might want to
> allow that.
That's magically taken care of, I tested even with a line with just
just empty lines but also spaces. For some reason awk works more
reliably for the field cutting so I'll switch it.
>> + MODULE="${i}.ko"
>> + MODULE_UPDATE="$(grep -v ^# $BLACKLIST_MAP | grep $i | cut -f 1 | head -1).ko"
>> +
>> + COUNT=$(find $MODULE_DIR -type f -name ${MODULE} -or -name ${MODULE}.gz | wc -l)
>> + COUNT_REPLACE=$(find $MODULE_UPDATES -type f -name ${MODULE_UPDATE} -or -name ${MODULE_UPDATE}.gz | wc -l)
>> +
>> + if [ $COUNT -ne 0 ]; then
>> + if [ $COUNT_REPLACE -ne 0 ]; then
>> + echo "Blacklisting $MODULE ..."
>> + echo blacklist $i >> $BLACKLIST_CONF
>> + fi
>
> So you do mean "# new-driver old-driver", but then shouldn't the iwlwifi
> lines be reversed?
You would know better, sorry I thought iwlagn replaces those, I'll swap.
Luis
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
