From e28f3504fe7e8b9e761776cd7e9bfdbccbdfe598dee059d9500dc80c51a94bdf Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Mon, 8 Oct 2012 17:11:11 +0000
Subject: [PATCH] - bnc#782835 - Xen HVM Guest fails (errors) to launch on
Opensuse 12.2 + Xen 4.2 + 'xl' toolstack xen-pygrub-grub-args.patch
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=208
---
init.xendomains | 2 +-
tmp-initscript-modprobe.patch | 2 +-
xen-destdir.diff | 2 +-
xen-pygrub-grub-args.patch | 13 +++++++++++++
xen.changes | 7 +++++++
xen.spec | 3 ++-
6 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 xen-pygrub-grub-args.patch
diff --git a/init.xendomains b/init.xendomains
index 0b1abc5..3896661 100644
--- a/init.xendomains
+++ b/init.xendomains
@@ -56,7 +56,7 @@ xendomains_abort()
check()
{
- XEND=`pidof -x /usr/sbin/xend`
+ XEND=`pidof -x /usr/sbin/xend`
if [ -z "$XEND" ]; then
xm_cmd="xl -f"
else
diff --git a/tmp-initscript-modprobe.patch b/tmp-initscript-modprobe.patch
index e44b969..96744f0 100644
--- a/tmp-initscript-modprobe.patch
+++ b/tmp-initscript-modprobe.patch
@@ -2,7 +2,7 @@ Index: xen-4.2.0-testing/tools/hotplug/Linux/init.d/xencommons
===================================================================
--- xen-4.2.0-testing.orig/tools/hotplug/Linux/init.d/xencommons
+++ xen-4.2.0-testing/tools/hotplug/Linux/init.d/xencommons
-@@ -60,21 +60,26 @@ do_start () {
+@@ -54,21 +54,26 @@ do_start () {
local time=0
local timeout=30
diff --git a/xen-destdir.diff b/xen-destdir.diff
index 220896a..f367dac 100644
--- a/xen-destdir.diff
+++ b/xen-destdir.diff
@@ -129,7 +129,7 @@ Index: xen-4.2.0-testing/stubdom/Makefile
===================================================================
--- xen-4.2.0-testing.orig/stubdom/Makefile
+++ xen-4.2.0-testing/stubdom/Makefile
-@@ -398,7 +398,7 @@ install-grub: pv-grub
+@@ -396,7 +396,7 @@ install-grub: pv-grub
install-xenstore: xenstore-stubdom
$(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot"
diff --git a/xen-pygrub-grub-args.patch b/xen-pygrub-grub-args.patch
new file mode 100644
index 0000000..4153ec5
--- /dev/null
+++ b/xen-pygrub-grub-args.patch
@@ -0,0 +1,13 @@
+Index: xen-4.2.0-testing/tools/pygrub/src/pygrub
+===================================================================
+--- xen-4.2.0-testing.orig/tools/pygrub/src/pygrub
++++ xen-4.2.0-testing/tools/pygrub/src/pygrub
+@@ -623,7 +623,7 @@ def run_grub(file, entry, fs, arg):
+ if img.args:
+ grubcfg["args"] += img.args
+ if arg:
+- grubcfg["args"] += " " + args
++ grubcfg["args"] += " " + arg
+
+ return grubcfg
+
diff --git a/xen.changes b/xen.changes
index 1e16d68..90023d3 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 8 07:53:24 MDT 2012 - carnold@novell.com
+
+- bnc#782835 - Xen HVM Guest fails (errors) to launch on Opensuse
+ 12.2 + Xen 4.2 + 'xl' toolstack
+ xen-pygrub-grub-args.patch
+
-------------------------------------------------------------------
Mon Oct 8 14:21:59 CEST 2012 - ohering@suse.de
diff --git a/xen.spec b/xen.spec
index 08949b1..b24f5bd 100644
--- a/xen.spec
+++ b/xen.spec
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: xen
ExclusiveArch: %ix86 x86_64
%define xvers 4.2
@@ -251,6 +250,7 @@ Patch379: xend-migration-domname-fix.patch
Patch380: xm-create-maxmem.patch
Patch381: vif-bridge-tap-fix.patch
Patch382: xend-cpuid.patch
+Patch383: xen-pygrub-grub-args.patch
# ioemu part of blktap patch series
Patch410: ioemu-blktap-fv-init.patch
Patch411: ioemu-blktap-image-format.patch
@@ -736,6 +736,7 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch380 -p1
%patch381 -p1
%patch382 -p1
+%patch383 -p1
%patch410 -p1
%patch411 -p1
%patch412 -p1