On Wed, 2013-04-10 at 04:35 -0700, Luis R. Rodriguez wrote:

> --- /dev/null
> +++ b/backport/.blacklist.map
> @@ -0,0 +1,10 @@
> +# Update this map when a driver gets renamed or
> +# symbols from old drivers get moved to a newer
> +# driver. If you have the driver on the right
> +# hand side it will be blacklisted upon installation
> +# only if you actually installed the driver on the
> +# left.
> +
> +# new-driver old-driver
> +iwlagn               iwlwifi
> +iwlagn               iwl4965

Seems that's really

# old-driver    new-driver

no?

> +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 ;-)

> +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.

> +     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?

johannes

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to