client/tests/kvm/scripts/qemu-ifup - Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch

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: client/tests/kvm/scripts/qemu-ifup

Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch (Closed) Base URL: http://git.chromium.org/git/autotest.git@master

Patch Set: Created 10 years, 1 month ago

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

Jump to:

OLD	NEW
1 #!/bin/sh	1 #!/bin/sh

2	2

3 # The following expression selects the first bridge listed by 'brctl show'.	3 # The following expression selects the first bridge listed by 'brctl show'.

4 # Modify it to suit your needs.	4 # Modify it to suit your needs.

5 switch=$(/usr/sbin/brctl show \| awk 'NR==2 { print $1 }')	5 switch=$(/usr/sbin/brctl show \| awk 'NR==2 { print $1 }')

6	6

	7 /bin/echo 1 > /proc/sys/net/ipv6/conf/${switch}/disable_ipv6

7 /sbin/ifconfig $1 0.0.0.0 up	8 /sbin/ifconfig $1 0.0.0.0 up

8 /usr/sbin/brctl addif ${switch} $1	9 /usr/sbin/brctl addif ${switch} $1

9 /usr/sbin/brctl setfd ${switch} 0	10 /usr/sbin/brctl setfd ${switch} 0

10 /usr/sbin/brctl stp ${switch} off	11 /usr/sbin/brctl stp ${switch} off

OLD	NEW