From e66be7e48421f0a67f29dd7d572d42c7627807c7 Mon Sep 17 00:00:00 2001
From: Roger Pau Monne <roger.pau@citrix.com>
Date: Wed, 13 Mar 2013 17:42:17 +0000
Subject: xl: add vif.default.bridge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a replacement for defaultbridge xl.conf option. The now
deprecated defaultbridge is still supported.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 docs/man/xl.conf.pod.5 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs/man')

diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5
index f8f7e7fc79..31aebcaa90 100644
--- a/docs/man/xl.conf.pod.5
+++ b/docs/man/xl.conf.pod.5
@@ -76,10 +76,12 @@ Configures the default hotplug script used by virtual network devices.
 
 Default: C</etc/xen/scripts/vif-bridge>
 
-=item B<defaultbridge="NAME">
+=item B<vif.default.bridge="NAME">
 
 Configures the default bridge to set for virtual network devices.
 
+The old B<defaultbridge> option is deprecated and should not be used.
+
 Default: C<xenbr0>
 
 =item B<vif.default.gatewaydev="NAME">
-- 
cgit v1.2.3