RE: [Xen-devel] [PATCH] warn when iproute2 or bridge-utils aremissing]]

[Nivedita Singhvi <nsnix@xxxxxxxxxxx>]

> How's about someone knocks up a patch to make routing the default (and
> renames the current 'network' script to 'network-bridge'), and updates
> the documentation appropriately?
>
> Ian
Here's a start - altered the default in the default xend config
file and updated tools/README.  The network script needs to be
renamed network-bridge (no patch for that ;)).
User manual documentation patches will follow too, in a while,
along with other cleanups in the scripts...

thanks,
Nivedita

---
Nivedita Singhvi
niv@xxxxxxxxxx
nsnix@xxxxxxxxxxx


--- xend-config.sxp     2005-02-25 20:13:02.000000000 -0800
+++ xend-config.sxp.new 2005-02-26 17:47:08.000000000 -0800
@@ -10,17 +10,23 @@
 
 ## Use the following if VIF traffic is routed.
 # The script used to start/stop networking for xend.
-#(network-script     network-route)
+(network-script     network-route)
 # The default script used to control virtual interfaces.
-#(vif-script         vif-route)
+(vif-script         vif-route)
+
+## Use the following if VIF traffic is NAT'd.
+# The script used to start/stop networking for xend.
+#(network-script     network-nat)
+# The default script used to control virtual interfaces.
+#(vif-script         vif-nat)
 
 ## Use the following if VIF traffic is bridged.
 # The script used to start/stop networking for xend.
-(network-script    network)
+#(network-script    network)
 # The default bridge that virtual interfaces should be connected to.
-(vif-bridge        xen-br0)
+#(vif-bridge        xen-br0)
 # The default script used to control virtual interfaces.
-(vif-script        vif-bridge)
+#(vif-script        vif-bridge)
 
 # Whether iptables should be set up to prevent IP spoofing for
 # virtual interfaces. Specify 'yes' or 'no'.

--- README      2005-02-26 17:22:36.000000000 -0800
+++ README.new  2005-02-26 17:33:14.000000000 -0800
@@ -9,8 +9,17 @@
 send it (preferably with a little summary to go in this file) to
 <xen-devel@xxxxxxxxxxxxxxxxxxxxx> so we can add it to this directory.
 
-network             - default network setup script called by xend at startup.
-vif-bridge          - default virtual network interface setup script.
+Routing is set up as the default mechanism to handle
+traffic between Dom0 and DomN. Edit the configuration
+file that xend reads (default: xend-config.sxp) to 
+change this default to bridging or NAT.
+
+network-route       - network setup script called by xend when routing.
+vif-route           - virtual network interface setup script when routing.
+network-bridge      - network setup script called by xend when bridging.
+vif-bridge          - virtual network interface setup script when bridging.
+network-nat         - network setup script called by xend for nat.
+vif-nat             - virtual network interface setup script for nat.
 xend-config.sxp     - default xend configuration file.
 xmexample1          - example configuration script for 'xm create'.
 xmexample2          - a more complex configuration script for 'xm create'.