[fedora-virt-maint] rpms/xen/devel xen-initscript-pvops.patch, NONE, 1.1 xen.spec, 1.230, 1.231

[Gerd Hoffmann]

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21503

Modified Files:
	xen.spec 
Added Files:
	xen-initscript-pvops.patch 
Log Message:
fix xenstored init script for pv_ops kernel

xen-initscript-pvops.patch:

--- NEW FILE xen-initscript-pvops.patch ---
pv_ops/dom0 kernel has xenfs -> mount it if needed.

--- a/tools/examples/init.d/xenstored.orig	2009-02-26 16:01:57.000000000 +0100
+++ b/tools/examples/init.d/xenstored	2009-02-26 16:03:20.000000000 +0100
@@ -25,6 +25,9 @@
 if [ ! -d /proc/xen ]; then
 	exit 0
 fi
+if [ ! -f /proc/xen/capabilities ]; then
+	mount -t xenfs xen /proc/xen
+fi
 if ! grep -q "control_d" /proc/xen/capabilities ; then
 	exit 0
 fi
@@ -38,6 +41,7 @@ test -f /etc/sysconfig/xenstored && . /e
 
 start() {
 	echo -n $"Starting xenstored daemon: "
+	rm -f /var/lib/xenstored/tdb
         /usr/sbin/xenstored --pid-file $XENSTORED_PID $XENSTORED_ARGS
 	RETVAL=$?
 	test $RETVAL = 0 && echo_success || echo_failure


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- xen.spec	27 Feb 2009 09:58:07 -0000	1.230
+++ xen.spec	2 Mar 2009 10:46:16 -0000	1.231
@@ -66,6 +66,7 @@
 Source13: pciutils-2.2.9.tar.bz2
 Source14: grub-0.97.tar.gz
 Patch1: xen-initscript.patch
+Patch2: xen-initscript-pvops.patch
 Patch8: xen-xenstore-cli.patch
 Patch13: xen-dumpdir.patch
 Patch14: xen-net-disable-bridge-by-default.patch
@@ -166,6 +167,7 @@
 %prep
 %setup -q -n %{directory_tag}
 %patch1 -p1
+%patch2 -p1
 %patch8 -p1
 
 %patch13 -p1
@@ -497,6 +499,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Mar 2 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.3.1-7
+- fix xenstored init script for pv_ops kernel.
+
 * Fri Feb 27 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.3.1-6
 - fix xenstored crash.
 - backport qemu-unplug patch.