From 7ba38da9fc8320e32d8d0d15e632d4cf5301d5816dda97a0e5ae4df3abdffb76 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Thu, 15 Aug 2013 21:14:40 +0000
Subject: [PATCH] - Change the default bridge in xl.conf from xenbr0 to just
 br0   xl-conf-default-bridge.patch - Add network.target to xendomains.service
 'After' tag   xendomains.service

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=263
---
 xen.changes                  |  8 ++++++++
 xen.spec                     |  4 +++-
 xendomains.service           |  2 +-
 xl-conf-default-bridge.patch | 11 +++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 xl-conf-default-bridge.patch

diff --git a/xen.changes b/xen.changes
index 76967c6..aff021e 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug 15 14:54:04 MDT 2013 - carnold@suse.com
+
+- Change the default bridge in xl.conf from xenbr0 to just br0 
+  xl-conf-default-bridge.patch                                 
+- Add network.target to xendomains.service 'After' tag
+  xendomains.service
+
 -------------------------------------------------------------------
 Wed Jul 31 11:34:14 MDT 2013 - carnold@suse.com
 
diff --git a/xen.spec b/xen.spec
index 5fe63af..453ac85 100644
--- a/xen.spec
+++ b/xen.spec
@@ -138,7 +138,7 @@ BuildRequires:  xorg-x11
 BuildRequires:  lndir
 %endif
 %endif
-Version:        4.3.0_08
+Version:        4.3.0_09
 Release:        0
 PreReq:         %insserv_prereq %fillup_prereq
 Summary:        Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
@@ -212,6 +212,7 @@ Patch312:       bridge-bonding.patch
 Patch313:       bridge-record-creation.patch
 Patch314:       vif-bridge-no-iptables.patch
 Patch315:       vif-bridge-tap-fix.patch
+Patch316:       xl-conf-default-bridge.patch
 Patch320:       network-nat-open-SuSEfirewall2-FORWARD.patch
 Patch321:       udev-rules.patch
 Patch322:       libxen_permissive.patch
@@ -502,6 +503,7 @@ Authors
 %patch313 -p1
 %patch314 -p1
 %patch315 -p1
+%patch316 -p1
 %patch320 -p1
 %patch321 -p1
 %patch322 -p1
diff --git a/xendomains.service b/xendomains.service
index 96adcbe..a80f82a 100644
--- a/xendomains.service
+++ b/xendomains.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Xendomains - start and stop Xen VMs on boot and shutdown
 Requires=xenstored.service xenconsoled.service
-After=xenstored.service xenconsoled.service
+After=xenstored.service xenconsoled.service network.target
 ConditionPathExists=/proc/xen
 
 [Service]
diff --git a/xl-conf-default-bridge.patch b/xl-conf-default-bridge.patch
new file mode 100644
index 0000000..9d146f6
--- /dev/null
+++ b/xl-conf-default-bridge.patch
@@ -0,0 +1,11 @@
+--- xen-4.3.0-testing/tools/examples/xl.conf.orig	2013-08-15 12:00:06.000000000 -0600
++++ xen-4.3.0-testing/tools/examples/xl.conf	2013-08-15 12:00:56.000000000 -0600
+@@ -26,7 +26,7 @@
+ #vif.default.script="vif-bridge"
+ 
+ # default bridge device to use with vif-bridge hotplug scripts
+-#vif.default.bridge="xenbr0"
++vif.default.bridge="br0"
+ 
+ # Reserve a claim of memory when launching a guest. This guarantees immediate
+ # feedback whether the guest can be launched due to memory exhaustion