Ubuntu Server Guide

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

  1. bug-836100
  2. Merge into 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
=== modified file 'serverguide/C/vpn.xml'
--- serverguide/C/vpn.xml 2011-05-03 07:11:18 +0000
+++ serverguide/C/vpn.xml 2011-08-28 16:13:24 +0000
@@ -211,7 +211,7 @@
211DEV=$2211DEV=$2
212MTU=$3212MTU=$3
213/sbin/ifconfig $DEV mtu $MTU promisc up213/sbin/ifconfig $DEV mtu $MTU promisc up
214/usr/sbin/brctl addif $BR $DEV214/sbin/brctl addif $BR $DEV
215</programlisting>215</programlisting>
216216
217 <para>217 <para>
@@ -224,7 +224,7 @@
224BR=$1224BR=$1
225DEV=$2225DEV=$2
226226
227/usr/sbin/brctl delif $BR $DEV227/sbin/brctl delif $BR $DEV
228/sbin/ifconfig $DEV down228/sbin/ifconfig $DEV down
229</programlisting>229</programlisting>
230230

Subscribers

People subscribed via source and target branches