rpms/xen/devel xen-net-bridge.patch,1.2,1.3 xen.spec,1.195,1.196

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6331

Modified Files:
	xen-net-bridge.patch xen.spec 
Log Message:
Disable network-bridge script by default to avoid NetworkManager conflict

xen-net-bridge.patch:

Index: xen-net-bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-bridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-net-bridge.patch	4 May 2007 14:14:50 -0000	1.2
+++ xen-net-bridge.patch	3 Nov 2007 19:11:15 -0000	1.3
@@ -1,6 +1,6 @@
-diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/network-bridge xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/network-bridge
---- xen-3.0.5-testing.hg-rc2-14889/tools/examples/network-bridge	2007-04-23 19:21:23.000000000 -0400
-+++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/network-bridge	2007-04-26 11:14:10.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/examples/network-bridge xen-3.1.0-src/tools/examples/network-bridge
+--- xen-3.1.0-src.orig/tools/examples/network-bridge	2007-11-03 15:05:06.000000000 -0400
++++ xen-3.1.0-src/tools/examples/network-bridge	2007-11-03 15:05:19.000000000 -0400
 @@ -5,9 +5,10 @@
  # The script name to use is defined in /etc/xen/xend-config.sxp
  # in the network-script field.
@@ -203,10 +203,9 @@
  }
  
  # adds $dev to $bridge but waits for $dev to be in running state first
-Only in xen-3.0.5-testing.hg-rc2-14889.new/tools/examples: network-bridge~
-diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/vif-bridge xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/vif-bridge
---- xen-3.0.5-testing.hg-rc2-14889/tools/examples/vif-bridge	2007-04-23 19:21:23.000000000 -0400
-+++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/vif-bridge	2007-04-26 11:06:37.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/examples/vif-bridge xen-3.1.0-src/tools/examples/vif-bridge
+--- xen-3.1.0-src.orig/tools/examples/vif-bridge	2007-11-03 15:05:06.000000000 -0400
++++ xen-3.1.0-src/tools/examples/vif-bridge	2007-11-03 15:05:19.000000000 -0400
 @@ -44,6 +44,32 @@ then
    then
       fatal "Could not find bridge, and none was specified"
@@ -252,9 +251,9 @@
  then
    success
  fi
-diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/xend-config.sxp xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xend-config.sxp
---- xen-3.0.5-testing.hg-rc2-14889/tools/examples/xend-config.sxp	2007-04-26 11:06:17.000000000 -0400
-+++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xend-config.sxp	2007-04-26 11:06:37.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/examples/xend-config.sxp xen-3.1.0-src/tools/examples/xend-config.sxp
+--- xen-3.1.0-src.orig/tools/examples/xend-config.sxp	2007-11-03 15:05:06.000000000 -0400
++++ xen-3.1.0-src/tools/examples/xend-config.sxp	2007-11-03 15:08:17.000000000 -0400
 @@ -118,9 +118,7 @@
  ##
  # To bridge network traffic, like this:
@@ -266,21 +265,24 @@
  #                            |
  # domU: fake eth0 -> vifN.0 -+
  #
-@@ -143,6 +141,13 @@
+@@ -142,7 +140,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)
-+#### LAPTOP USERS ! #####
-+# For laptops, or machines where network interfaces come/go on-the-fly,
-+# or are otherwise managed by NetworkManager, comment out the above line.
-+# Then, uncomment the line below, and use libvirt's virtual networking
-+# capability which sets up a isolated bridge + NAT forwarding
-+#(network-script /bin/true)
-+#### LAPTOP USERS ! #####
+-(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
-@@ -162,12 +167,14 @@
+@@ -162,12 +168,14 @@
  
  ## Use the following if network traffic is routed, as an alternative to the
  # settings for bridged networking given above.
@@ -295,9 +297,9 @@
  #(network-script network-nat)
  #(vif-script     vif-nat)
  
-diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/xen-network-common.sh xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xen-network-common.sh
---- xen-3.0.5-testing.hg-rc2-14889/tools/examples/xen-network-common.sh	2007-04-23 19:21:23.000000000 -0400
-+++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xen-network-common.sh	2007-04-26 11:06:37.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/examples/xen-network-common.sh xen-3.1.0-src/tools/examples/xen-network-common.sh
+--- xen-3.1.0-src.orig/tools/examples/xen-network-common.sh	2007-11-03 15:05:06.000000000 -0400
++++ xen-3.1.0-src/tools/examples/xen-network-common.sh	2007-11-03 15:05:19.000000000 -0400
 @@ -90,8 +90,6 @@ find_dhcpd_init_file()
  }
  
@@ -340,9 +342,9 @@
  }
  
  # Usage: add_to_bridge bridge dev
-diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/target-i386-dm/qemu-ifup xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/target-i386-dm/qemu-ifup
---- xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/target-i386-dm/qemu-ifup	2007-04-23 19:21:23.000000000 -0400
-+++ xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/target-i386-dm/qemu-ifup	2007-04-26 11:06:37.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/qemu-ifup xen-3.1.0-src/tools/ioemu/target-i386-dm/qemu-ifup
+--- xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/qemu-ifup	2007-11-03 15:05:06.000000000 -0400
++++ xen-3.1.0-src/tools/ioemu/target-i386-dm/qemu-ifup	2007-11-03 15:05:19.000000000 -0400
 @@ -5,5 +5,33 @@
  
  echo 'config qemu network with xen bridge for ' $*


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- xen.spec	26 Oct 2007 16:40:36 -0000	1.195
+++ xen.spec	3 Nov 2007 19:11:15 -0000	1.196
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -295,6 +295,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Sat Nov  3 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-14.fc9
+- Disable network-bridge script since it conflicts with NetworkManager
+  which is now on by default
+
 * Fri Oct 26 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-13.fc9
 - Fixed xenbaked tmpfile flaw (CVE-2007-3919)