xen/xend-config.diff

Index: xen-3.2-testing/tools/examples/init.d/sysconfig.xendomains
===================================================================
--- xen-3.2-testing.orig/tools/examples/init.d/sysconfig.xendomains
+++ xen-3.2-testing/tools/examples/init.d/sysconfig.xendomains
@@ -1,4 +1,4 @@
-## Path: System/xen
+## Path: System/Virtualization
 ## Description: xen domain start/stop on boot
 ## Type: string
 ## Default: 
@@ -98,7 +98,6 @@ XENDOMAINS_RESTORE=true
 # Note that the script tries to be clever if both RESTORE and AUTO are 
 # set: It will first restore saved domains and then only start domains
 # in AUTO which are not running yet. 
-# Note that the name matching is somewhat fuzzy.
 #
 XENDOMAINS_AUTO=/etc/xen/auto
 
@@ -109,9 +108,8 @@ XENDOMAINS_AUTO=/etc/xen/auto
 # files in XENDOMAINS_AUTO will be treated according to XENDOMAINS_SYSRQ,
 # XENDOMAINS_MIGRATE, XENDOMAINS_SAVE, XENDMAINS_SHUTDOWN; otherwise
 # all running domains will be. 
-# Note that the name matching is somewhat fuzzy.
 # 
-XENDOMAINS_AUTO_ONLY=false
+XENDOMAINS_AUTO_ONLY=true
 
 ## Type: integer
 ## Default: 300
Index: xen-3.2-testing/tools/examples/xend-config.sxp
===================================================================
--- xen-3.2-testing.orig/tools/examples/xend-config.sxp
+++ xen-3.2-testing/tools/examples/xend-config.sxp
@@ -49,16 +49,19 @@
 #
 #                    (9367 pam '' /etc/xen/xen-api.key /etc/xen/xen-api.crt)
 #
-# Default:
-#   (xen-api-server ((unix)))
+
+# Until the CIMOM supports authentication, do not require authentication on
+# the unix socket.  The socket is restricted to root via file permissions.
+(xen-api-server ((unix none)))
 
 
 #(xend-http-server no)
-#(xend-unix-server no)
+(xend-unix-server yes)
 #(xend-tcp-xmlrpc-server no)
 #(xend-unix-xmlrpc-server yes)
+# Only enable xend-relocation-server on trusted networks.  Currently
+# lacks encryption and authentication.
 #(xend-relocation-server no)
-(xend-relocation-server yes)
 
 #(xend-unix-path /var/lib/xend/xend-socket)
 
@@ -136,7 +139,54 @@
 # two fake interfaces per guest domain.  To do things like this, write
 # yourself a wrapper script, and call network-bridge from it, as appropriate.
 #
-(network-script network-bridge)
+#(network-script network-bridge)
+
+# network-multinet is a replacement for the Xen network-bridge, network-nat
+# and network-route scripts.  network-multinet allows for the creation of
+# multiple networks, supporting the following types:
+#
+#
+# This script can create 6 types of networks:
+#
+#  bridged:    -Networks that are connected to a physical network device
+#               in Dom0 and on which Dom0 can communitcate
+#              -This is the traditional type of network created in xen by 
+#               the basic network-bridge script.
+#              -VMs on these network(s) appear to be on the real network(s)
+#
+#  nohost:     -Networks that are connected to Dom0 but on which Dom0 cannot
+#               communitcate
+#              -These can be used to allow virtual machines to communicate 
+#               with the outside world but not with Dom0. 
+#               (Usefull if you want to isolate traffic away from Dom0)
+#
+#  hostonly:   -Networks that are connected to Dom0 but are private from
+#               the physical network
+#              -This type of network will allow VMs connected to it to 
+#               access only Dom0 and other VMs connected to the network.
+#              -This type of network is similiar to a VMware "HOST ONLY" 
+#               network.
+#
+#  nat:        -Networks that are connected to Dom0 and are private from the
+#               physical network but VMs can get out to the physical network
+#              -This type of network will allow VMs connected to it to access 
+#               Dom0, the "outside world" via NAT and other VMs connected to it.
+#              -This type of network is similiar to a VMware "NAT" network.
+#
+#  routed:     -Networks that are not directly connected to the physical network
+#               but who's traffic is directly routed to other networks
+#              -This type of network will allow VMs connected to it to access 
+#               Dom0, the "outside world" via routing through Dom0 and other VMs 
+#               connected to it.
+#
+#  empty:      -Networks that are not connected to either Dom0 or the physical
+#               network
+#              -These can be used to allow VMs in DomUs to communicate only 
+#               with other DomUs and not Dom0.
+#
+# See /etc/xen/scripts/network-multinet for more details.
+#
+(network-script network-multinet)
 
 # The script used to control virtual interfaces.  This can be overridden on a
 # per-vif basis when creating a domain or a configuring a new vif.  The