From ecfc5c1137532f5c86c56390e090618eb6f62786238165288381c19f059e7eb6 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 15 Jun 2012 14:53:07 +0000 Subject: [PATCH] - bnc#767273 - unsupported /var/lock/subsys is still used by xendomains init.xendomains - bnc#- bnc#766283 - opensuse 12.2 pv guests can not start after installation due to lack of grub2 support in the host OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=193 --- init.xendomains | 8 +++++++- xen.changes | 9 ++++++++- xen.spec | 1 - 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/init.xendomains b/init.xendomains index 0b1abc5..1e20612 100644 --- a/init.xendomains +++ b/init.xendomains @@ -21,11 +21,17 @@ . /etc/rc.status rc_reset -LOCKFILE=/var/lock/subsys/xendomains XENDOM_CONFIG=/etc/sysconfig/xendomains RETCODE_FILE=/tmp/xendomains.rc.$$ xm_cmd=echo +# See docs/misc/distro_mapping.txt +if [ -d /var/lock/subsys ]; then + LOCKFILE=/var/lock/subsys/xendomains +else + LOCKFILE=/var/lock/xendomains +fi + . "$XENDOM_CONFIG" shopt -s dotglob nullglob diff --git a/xen.changes b/xen.changes index 561efdc..b7dc06d 100644 --- a/xen.changes +++ b/xen.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Fri Jun 15 08:45:50 MDT 2012 - carnold@novell.com + +- bnc#767273 - unsupported /var/lock/subsys is still used by xendomains + init.xendomains + ------------------------------------------------------------------- Tue Jun 12 14:37:00 MDT 2012 - carnold@novell.com -- Upstream pygrub patches for grub2 support and fixes +- bnc#766283 - opensuse 12.2 pv guests can not start after + installation due to lack of grub2 support in the host 24000-pygrub-grub2.patch 24001-pygrub-grub2.patch 24002-pygrub-grub2.patch diff --git a/xen.spec b/xen.spec index 412ab93..f95ad8a 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.1