Blob Blame History Raw
diff -rup xen-3.3.0-orig/tools/examples/xend-config.sxp xen-3.3.0-new/tools/examples/xend-config.sxp
--- xen-3.3.0-orig/tools/examples/xend-config.sxp	2008-08-22 10:49:07.000000000 +0100
+++ xen-3.3.0-new/tools/examples/xend-config.sxp	2008-08-29 11:28:39.000000000 +0100
@@ -149,7 +149,15 @@
 # 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)
+#####################################
+#
+# We assume NetworkManager is enabled by default & managing public
+# interfaces, including their bridge membership. Xen's networking
+# setup thus serves no useful purpose.
+(network-script /bin/true)
+# Only uncomment this if you are using legacy network init scripts. This 
+# will *NOT* play nicely with NetworkManager
+#(network-script network-bridge)
 
 # 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
@@ -169,12 +177,14 @@
 
 ## Use the following if network traffic is routed, as an alternative to the
 # settings for bridged networking given above.
+# NB: Obsolete. See note above for LAPTOP USERS
 #(network-script network-route)
 #(vif-script     vif-route)
 
 
 ## Use the following if network traffic is routed with NAT, as an alternative
 # to the settings for bridged networking given above.
+# NB: Obsolete. See note above for LAPTOP USERS
 #(network-script network-nat)
 #(vif-script     vif-nat)