udev-addon.conf - Issue 6677181: Blacklist brcm* drivers from preload-wifi-driver

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: udev-addon.conf

Issue 6677181: Blacklist brcm* drivers from preload-wifi-driver (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/init.git@master

Patch Set: Move blacklisting to udev-addon.conf Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.	1 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 description "Trigger udev events"	5 description "Trigger udev events"

6 author "chromium-os-dev@chromium.org"	6 author "chromium-os-dev@chromium.org"

7	7

8 # We must run eventually even if the UI doesn't come up correctly,	8 # We must run eventually even if the UI doesn't come up correctly,

9 # because network configuration depends on this job.	9 # because network configuration depends on this job.

10 start on starting failsafe	10 start on starting failsafe

(...skipping 15 matching lines...) Expand all Loading...
26	26

27 if [ -n "$drv" ] ; then	27 if [ -n "$drv" ] ; then

28 drvmod=$(lsmod \| awk 'd==$1 { print $1 }' d="$drv")	28 drvmod=$(lsmod \| awk 'd==$1 { print $1 }' d="$drv")

29 fi	29 fi

30	30

31 if [ -n "$drvmod" ] ; then	31 if [ -n "$drvmod" ] ; then

32 if [ -s $drvfile ] ; then	32 if [ -s $drvfile ] ; then

33 olddrv=$(head -1 $drvfile)	33 olddrv=$(head -1 $drvfile)

34 fi	34 fi

35	35

	36 # Blacklist brcm drivers
	jrbarnette 2011/04/06 22:20:51 Can you add a TODO here? I want to make sure it's Can you add a TODO here? I want to make sure it's clear that we know this is a hack, and to put a boundary around the reason why we need it. kliegs 2011/04/06 22:30:12 Done. Show quoted text On 2011/04/06 22:20:51, jrbarnette wrote: > Can you add a TODO here? I want to make sure it's clear that we > know this is a hack, and to put a boundary around the reason why > we need it. Done.
	37 if [ "$(echo $drv \| head -c4)" = "brcm" ] ; then

	38 [ -s $drvfile ] && rm $drvfile
	jrbarnette 2011/04/06 22:20:51 Ugh. I'm not fond of this idiom. This will work Ugh. I'm not fond of this idiom. This will work equivalently: rm -f $drvfile kliegs 2011/04/06 22:30:12 Done. Show quoted text On 2011/04/06 22:20:51, jrbarnette wrote: > Ugh. I'm not fond of this idiom. This will work equivalently: > rm -f $drvfile Done.
36 # Only update contents if they've changed.	39 # Only update contents if they've changed.

37 if [ "$drv" != "$olddrv" ] ; then	40 elif [ "$drv" != "$olddrv" ] ; then

38 echo "$drv" > $drvfile	41 echo "$drv" > $drvfile

39 fi	42 fi

40 else	43 else

41 logger "udev-addon:$iwdev: $drv is not a module."	44 logger "udev-addon:$iwdev: $drv is not a module."

42 fi	45 fi

43 end script	46 end script

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »