rpms/xen/devel xen-initscript.patch, 1.8, 1.8.2.1 xen.spec, 1.194.2.8, 1.194.2.9 xen-block-readonly.patch, 1.1, NONE
Daniel P. Berrange (berrange)
fedora-extras-commits at redhat.com
Fri Dec 14 17:40:55 UTC 2007
Author: berrange
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30979
Modified Files:
Tag: private-berrange-xen-unstable
xen-initscript.patch xen.spec
Removed Files:
Tag: private-berrange-xen-unstable
xen-block-readonly.patch
Log Message:
Re-diff initscript patch
xen-initscript.patch:
Index: xen-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-initscript.patch,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- xen-initscript.patch 12 Jun 2007 13:50:13 -0000 1.8
+++ xen-initscript.patch 14 Dec 2007 17:40:49 -0000 1.8.2.1
@@ -1,6 +1,6 @@
-diff -rup xen-3.1.0-src/tools/examples/init.d/xend xen-3.1.0-src.new/tools/examples/init.d/xend
---- xen-3.1.0-src/tools/examples/init.d/xend 2007-05-31 12:14:19.000000000 -0400
-+++ xen-3.1.0-src.new/tools/examples/init.d/xend 2007-05-31 17:53:29.000000000 -0400
+diff -rup xen-unstable-16606.orig/tools/examples/init.d/xend xen-unstable-16606.new/tools/examples/init.d/xend
+--- xen-unstable-16606.orig/tools/examples/init.d/xend 2007-12-13 04:31:03.000000000 -0500
++++ xen-unstable-16606.new/tools/examples/init.d/xend 2007-12-14 12:22:16.000000000 -0500
@@ -19,48 +19,161 @@
# Description: Starts and stops the Xen control daemon.
### END INIT INFO
@@ -186,10 +186,10 @@
-exit $?
+exit $RETVAL
-diff -rup xen-3.1.0-src/tools/misc/xend xen-3.1.0-src.new/tools/misc/xend
---- xen-3.1.0-src/tools/misc/xend 2007-05-31 13:10:49.000000000 -0400
-+++ xen-3.1.0-src.new/tools/misc/xend 2007-05-31 13:44:14.000000000 -0400
-@@ -8,123 +8,16 @@
+diff -rup xen-unstable-16606.orig/tools/misc/xend xen-unstable-16606.new/tools/misc/xend
+--- xen-unstable-16606.orig/tools/misc/xend 2007-12-13 04:31:03.000000000 -0500
++++ xen-unstable-16606.new/tools/misc/xend 2007-12-14 12:24:23.000000000 -0500
+@@ -8,142 +8,15 @@
"""Xen management daemon.
Provides console server and HTTP management api.
@@ -208,6 +208,8 @@
- On Solaris, the daemons are SMF managed, and you should not attempt
- to start xend by hand.
"""
+-import fcntl
+-import glob
-import os
-import os.path
import sys
@@ -216,14 +218,14 @@
-import time
-import commands
-
--result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]),
-- 'xen-python-path'))
--if result[0] != 0:
-- print >>sys.stderr, result[1]
-- sys.exit(1)
+-xpp = os.path.join(os.path.dirname(sys.argv[0]), 'xen-python-path')
+-if os.path.exists(xpp):
+- result = commands.getstatusoutput(xpp)
+- if result[0] != 0:
+- print >>sys.stderr, result[1]
+- sys.exit(1)
+- sys.path.append(result[1])
-
--sys.path.append(result[1])
-
from xen.xend.server import SrvDaemon
-class CheckError(ValueError):
@@ -261,6 +263,23 @@
- raise CheckError("invalid user")
-
-def start_xenstored():
+- pidfname = "/var/run/xenstore.pid"
+- try:
+- f = open(pidfname, "a")
+- try:
+- fcntl.lockf(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
+- rootdir = os.getenv("XENSTORED_ROOTDIR") or "/var/lib/xenstored"
+- for i in glob.glob(rootdir + "/tdb*"):
+- try:
+- os.unlink(i)
+- except:
+- pass
+- os.unlink(pidfname)
+- except:
+- pass
+- f.close()
+- except:
+- pass
- XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
- cmd = "xenstored --pid-file /var/run/xenstore.pid"
- if XENSTORED_TRACE:
@@ -314,21 +333,21 @@
if __name__ == '__main__':
sys.exit(main())
-diff -rup xen-3.1.0-src/tools/python/xen/xend/osdep.py xen-3.1.0-src.new/tools/python/xen/xend/osdep.py
---- xen-3.1.0-src/tools/python/xen/xend/osdep.py 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/osdep.py 2007-05-31 13:13:07.000000000 -0400
-@@ -25,7 +25,7 @@ _scripts_dir = {
- }
+diff -rup xen-unstable-16606.orig/tools/python/xen/xend/osdep.py xen-unstable-16606.new/tools/python/xen/xend/osdep.py
+--- xen-unstable-16606.orig/tools/python/xen/xend/osdep.py 2007-12-13 04:31:03.000000000 -0500
++++ xen-unstable-16606.new/tools/python/xen/xend/osdep.py 2007-12-14 12:25:03.000000000 -0500
+@@ -26,7 +26,7 @@ _scripts_dir = {
_xend_autorestart = {
+ "NetBSD": True,
- "Linux": True,
+ "Linux": False,
"SunOS": False,
}
-diff -rup xen-3.1.0-src/tools/python/xen/xend/server/SrvDaemon.py xen-3.1.0-src.new/tools/python/xen/xend/server/SrvDaemon.py
---- xen-3.1.0-src/tools/python/xen/xend/server/SrvDaemon.py 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/SrvDaemon.py 2007-05-31 14:36:23.000000000 -0400
+diff -rup xen-unstable-16606.orig/tools/python/xen/xend/server/SrvDaemon.py xen-unstable-16606.new/tools/python/xen/xend/server/SrvDaemon.py
+--- xen-unstable-16606.orig/tools/python/xen/xend/server/SrvDaemon.py 2007-12-13 04:31:03.000000000 -0500
++++ xen-unstable-16606.new/tools/python/xen/xend/server/SrvDaemon.py 2007-12-14 12:22:16.000000000 -0500
@@ -109,7 +109,14 @@ class Daemon:
# Fork, this allows the group leader to exit,
# which means the child can never again regain control of the
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.194.2.8
retrieving revision 1.194.2.9
diff -u -r1.194.2.8 -r1.194.2.9
--- xen.spec 13 Dec 2007 22:08:23 -0000 1.194.2.8
+++ xen.spec 14 Dec 2007 17:40:49 -0000 1.194.2.9
@@ -14,6 +14,7 @@
# The version that the dev tree will become when released
%define base_version 3.2.0
+%define base_release 1
# The changeset synced to
%define changeset 16606
@@ -40,7 +41,7 @@
%define release_prefix %{?changeset:0}%{!?changeset:%{base_release}}
-%define release_postfix %{?changeset:%{?relcandidate:.rc%{relcandidate}}.dev%{changeset}}
+%define release_postfix %{?changeset:%{?relcandidate:.rc%{relcandidate}}.dev%{changeset}.%{base_release}}
%define hv_build %{?changeset:1}%{!?changeset:0}
%define hv_abi %{?changeset:%{base_version}-%{changeset}}%{!?changeset:%{base_hv_abi}}
%define version_tag %{base_version}
@@ -145,7 +146,7 @@
%prep
%setup -q -n %{directory_tag}
-#%patch1 -p1 -b .init
+%patch1 -p1 -b .init
%patch3 -p1 -b .compile
%patch13 -p1
--- xen-block-readonly.patch DELETED ---
More information about the scm-commits
mailing list