rpms/xen/devel xen-default-network.patch, NONE, 1.1 xen.spec, 1.79, 1.80

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20011

Modified Files:
	xen.spec 
Added Files:
	xen-default-network.patch 
Log Message:
add patch so that it doesn't die if your default network device is
'eth1', or 'harry', or...


xen-default-network.patch:
 network-bridge          |    1 +
 xend-config.sxp         |    4 ++--
 xend-config.sxp.mem-min |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE xen-default-network.patch ---
diff -ru xen-3.0.0/tools/examples/network-bridge xen-3.0.0-new/tools/examples/network-bridge
--- xen-3.0.0/tools/examples/network-bridge	2006-01-25 15:30:13.000000000 -0500
+++ xen-3.0.0-new/tools/examples/network-bridge	2006-01-31 12:20:25.000000000 -0500
@@ -61,6 +61,7 @@
 
 vifnum=${vifnum:-0}
 bridge=${bridge:-xenbr${vifnum}}
+netdev=${netdev:-$(ip route list default scope global| awk '{ print $NF }')}
 netdev=${netdev:-eth${vifnum}}
 antispoof=${antispoof:-no}
 
diff -ru xen-3.0.0/tools/examples/xend-config.sxp xen-3.0.0-new/tools/examples/xend-config.sxp
--- xen-3.0.0/tools/examples/xend-config.sxp	2006-01-31 12:23:38.000000000 -0500
+++ xen-3.0.0-new/tools/examples/xend-config.sxp	2006-01-31 12:24:44.000000000 -0500
@@ -70,8 +70,8 @@
 #
 # (network-script network-bridge)
 #
-# Your eth0 is used as the outgoing interface, by default.  To use a different
-# one (e.g. eth1) use
+# Your default ethernet device is used as the outgoing interface, by default. 
+# To use a different one (e.g. eth1) use
 #
 # (network-script 'network-bridge netdev=eth1')
 #
diff -ru xen-3.0.0/tools/examples/xend-config.sxp.mem-min xen-3.0.0-new/tools/examples/xend-config.sxp.mem-min
--- xen-3.0.0/tools/examples/xend-config.sxp.mem-min	2006-01-06 17:42:59.000000000 -0500
+++ xen-3.0.0-new/tools/examples/xend-config.sxp.mem-min	2006-01-31 12:25:13.000000000 -0500
@@ -70,8 +70,8 @@
 #
 # (network-script network-bridge)
 #
-# Your eth0 is used as the outgoing interface, by default.  To use a different
-# one (e.g. eth1) use
+# Your default ethernet device is used as the outgoing interface, by default.
+# To use a different one (e.g. eth1) use
 #
 # (network-script 'network-bridge netdev=eth1')
 #


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xen.spec	31 Jan 2006 16:59:19 -0000	1.79
+++ xen.spec	31 Jan 2006 17:34:40 -0000	1.80
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0
-Release: 0.20060130.fc5.1
+Release: 0.20060130.fc5.2
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -16,6 +16,7 @@
 Patch1: xen-initscript.patch
 Patch3: xen-dom0-minmem.patch
 Patch4: xen-compile-fixes.patch
+Patch5: xen-default-network.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -46,6 +47,8 @@
 %patch1 -p1 -b .init
 %patch3 -p1 -b .mem-min
 %patch4 -p1 -b .compile
+%patch5 -p1
+
 cp %{SOURCE2} .
 
 %build
@@ -139,6 +142,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Tue Jan 31 2006 Bill Nottinghham <notting at redhat.com> 3.0-0.20060130.fc5.2
+- use the default network device, don't hardcode eth0
+
 * Tue Jan 31 2006  <sct at redhat.com> - 3.0-0.20060130.fc5.1
 - Add xenguest-install.py in /usr/sbin