Merge lp:~bertrand-goareguer/serverguide/bug-836100 into lp:~ubuntu-core-doc/serverguide/oneiric

Proposed by Beber
Status: Merged
Merge reported by: Jeremy Bícha
Merged at revision: not available
Proposed branch: lp:~bertrand-goareguer/serverguide/bug-836100
Merge into: lp:~ubuntu-core-doc/serverguide/oneiric
Diff against target: 20 lines (+2/-2)
1 file modified
serverguide/C/vpn.xml (+2/-2)
To merge this branch: bzr merge lp:~bertrand-goareguer/serverguide/bug-836100
Reviewer Review Type Date Requested Status
Jeremy Bícha Approve
Review via email: mp+73180@code.launchpad.net

Description of the change

Correction of bug#836100

To post a comment you must log in.
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Merged. Thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/vpn.xml'
2--- serverguide/C/vpn.xml 2011-05-03 07:11:18 +0000
3+++ serverguide/C/vpn.xml 2011-08-28 16:13:24 +0000
4@@ -211,7 +211,7 @@
5 DEV=$2
6 MTU=$3
7 /sbin/ifconfig $DEV mtu $MTU promisc up
8-/usr/sbin/brctl addif $BR $DEV
9+/sbin/brctl addif $BR $DEV
10 </programlisting>
11
12 <para>
13@@ -224,7 +224,7 @@
14 BR=$1
15 DEV=$2
16
17-/usr/sbin/brctl delif $BR $DEV
18+/sbin/brctl delif $BR $DEV
19 /sbin/ifconfig $DEV down
20 </programlisting>
21

Subscribers

People subscribed via source and target branches