rpms/xen/devel xen-initscript.patch, 1.5, 1.6 xen.spec, 1.161, 1.162 xen-vmxballoon-hack.patch, 1.3, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jan 18 18:19:06 UTC 2007


Author: berrange

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5907

Modified Files:
	xen-initscript.patch xen.spec 
Removed Files:
	xen-vmxballoon-hack.patch 
Log Message:
Remove obsolete VMX hack. Fix initscript again

xen-initscript.patch:
 xend |   49 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 41 insertions(+), 8 deletions(-)

Index: xen-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-initscript.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xen-initscript.patch	28 Sep 2006 22:48:54 -0000	1.5
+++ xen-initscript.patch	18 Jan 2007 18:19:04 -0000	1.6
@@ -1,6 +1,7 @@
---- xen-unstable-10712/tools/examples/init.d/xend.init	2006-07-21 13:31:22.000000000 -0400
-+++ xen-unstable-10712/tools/examples/init.d/xend	2006-08-22 17:23:55.000000000 -0400
-@@ -7,37 +7,63 @@
+diff -ruN xen-3.0.4_1-src.orig/tools/examples/init.d/xend xen-3.0.4_1-src.new/tools/examples/init.d/xend
+--- xen-3.0.4_1-src.orig/tools/examples/init.d/xend	2007-01-08 10:00:48.000000000 -0500
++++ xen-3.0.4_1-src.new/tools/examples/init.d/xend	2007-01-18 12:41:07.000000000 -0500
+@@ -7,40 +7,66 @@
  # chkconfig: 2345 98 01
  # description: Starts and stops the Xen control daemon.
  
@@ -30,11 +31,11 @@
 -	    xend status
 +	    /usr/sbin/xend status
  	done
-+        if [ $i -ge $rets ]; then
-+            RETVAL=-1
-+            return 1
-+        fi
-+        return 0
++	if [ $i -ge $rets ]; then
++	    RETVAL=-1
++	    return 1
++	fi
++	return 0
  }
  
  case "$1" in
@@ -42,6 +43,7 @@
 -	xend start
 +	echo -n $"Starting $prog: "
 +	modprobe blkbk
++	modprobe blktap
 +	modprobe netbk
 +	modprobe netloop
 +	/usr/sbin/xend start
@@ -51,26 +53,29 @@
 -	xend stop
 +	echo -n $"Stopping $prog: "
 +	/usr/sbin/xend stop
-+        RETVAL=$?
++	RETVAL=$?
  	;;
    status)
 -	xend status
 +	/usr/sbin/xend status
 +	if [ $? = 0 ] ; then
-+	    echo xend is running
++	    echo -n $"$prog is running"
 +	else
-+	    echo xend is stopped
++	    echo -n $"$prog is stopped"
++	    RETVAL=3
 +	fi
-+        exit 0
  	;;
-   restart|reload|force-reload)
+   reload)
+-        xend reload
++        /usr/sbin/xend reload
+         ;;
+   restart|force-reload)
 -	xend restart
-+        echo -n $"$1 $prog: "
 +	/usr/sbin/xend restart
  	await_daemons_up
  	;;
    *)
-@@ -47,5 +73,12 @@
+@@ -50,5 +76,12 @@
  	exit 1
  esac
  
@@ -84,13 +89,3 @@
 +fi
 +exit $RETVAL
  
---- xen-unstable-11539/tools/examples/init.d/xend.~1~	2006-09-25 15:57:54.000000000 +0100
-+++ xen-unstable-11539/tools/examples/init.d/xend	2006-09-25 16:11:07.000000000 +0100
-@@ -42,6 +42,7 @@
-   start)
- 	echo -n $"Starting $prog: "
- 	modprobe blkbk
-+	modprobe blktap
- 	modprobe netbk
- 	modprobe netloop
- 	/usr/sbin/xend start


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- xen.spec	18 Jan 2007 17:22:03 -0000	1.161
+++ xen.spec	18 Jan 2007 18:19:04 -0000	1.162
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.4
-Release: 1
+Release: 1%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -12,7 +12,6 @@
 Patch1: xen-initscript.patch
 Patch3: xen-compile-fixes.patch
 Patch6: xen-network-iptables-bridge.patch
-Patch8: xen-vmxballoon-hack.patch
 Patch20: xen-blktap-no-aio-epoll.patch
 Patch21: xen-blktap-error-returns.patch
 
@@ -82,11 +81,9 @@
 
 %prep
 %setup -q -n xen-3.0.4_1-src -a 1
-# XXX fix this
-#%patch1 -p1 -b .init
+%patch1 -p1 -b .init
 %patch3 -p1 -b .compile
 %patch6 -p1
-#patch8 -p1 # FIXME: need to pull this one back
 
 # blktap patches
 %patch20 -p1


--- xen-vmxballoon-hack.patch DELETED ---




More information about the fedora-cvs-commits mailing list