Author: acid
Date: 2006-03-21 17:31:32 +0000 (Tue, 21 Mar 2006)
New Revision: 129
Added:
trunk/xen-3.0/debian/patches/init.d.dpatch
Removed:
trunk/xen-3.0/debian/patches/40force-reload.dpatch
trunk/xen-3.0/debian/patches/xenstored_rundir.dpatch
Modified:
trunk/xen-3.0/debian/patches/00list
Log:
- merge init.d patches
- check if xend and xm are available before starting init.d script
Modified: trunk/xen-3.0/debian/patches/00list
==================================================================---
trunk/xen-3.0/debian/patches/00list 2006-03-21 17:08:49 UTC (rev 128)
+++ trunk/xen-3.0/debian/patches/00list 2006-03-21 17:31:32 UTC (rev 129)
@@ -1,7 +1,6 @@
10sysconfig
-40force-reload
libdir
manpages
version
compile_date
-xenstored_rundir
+init.d
Deleted: trunk/xen-3.0/debian/patches/40force-reload.dpatch
==================================================================---
trunk/xen-3.0/debian/patches/40force-reload.dpatch 2006-03-21 17:08:49 UTC (rev
128)
+++ trunk/xen-3.0/debian/patches/40force-reload.dpatch 2006-03-21 17:31:32 UTC
(rev 129)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## force-reload.dpatch by Julien Danjou <acid@debian.org>
-##
-## All lines beginning with `## DP:'' are a description of the patch.
-## DP: add force-reload supports to xendomains init script
-
-@DPATCH@
-diff -Naur xen-3.0.1.orig xen-3.0.1
---- xen-3.0.1.orig/tools/examples/init.d/xendomains 2006-01-31
17:09:20.000000000 +0100
-+++ xen-3.0.1/tools/examples/init.d/xendomains 2006-02-20 14:05:23.000000000
+0100
-@@ -474,7 +474,7 @@
- restart)
- restart
- ;;
-- reload)
-+ reload|force-reload)
- reload
- ;;
-
-@@ -492,7 +492,7 @@
- ;;
-
- *)
-- echo "Usage: $0 {start|stop|restart|reload|status}"
-+ echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
- rc_failed 3
- rc_status -v
- ;;
Added: trunk/xen-3.0/debian/patches/init.d.dpatch
==================================================================---
trunk/xen-3.0/debian/patches/init.d.dpatch 2006-03-21 17:08:49 UTC (rev 128)
+++ trunk/xen-3.0/debian/patches/init.d.dpatch 2006-03-21 17:31:32 UTC (rev 129)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## init.d.dpatch by Julien Danjou <acid@debian.org>
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: Patch init.d scripts
+
+@DPATCH@
+diff -ru xen-3.0.1.orig/tools/examples/init.d/xend
xen-3.0.1/tools/examples/init.d/xend
+--- xen-3.0.1.orig/tools/examples/init.d/xend 2006-01-31 17:09:20.000000000
+0100
++++ xen-3.0.1/tools/examples/init.d/xend 2006-03-21 18:27:18.000000000 +0100
+@@ -7,7 +7,9 @@
+ # chkconfig: 2345 98 01
+ # description: Starts and stops the Xen control daemon.
+
+-if ! [ -e /proc/xen/privcmd ]; then
++XENSTORED_RUN_DIR="/var/run/xenstored"
++
++if [ ! -e /proc/xen/privcmd -a -x /usr/sbin/xend ]; then
+ exit 0
+ fi
+
+@@ -27,6 +29,7 @@
+
+ case "$1" in
+ start)
++ [ -d "$XENSTORED_RUN_DIR" ] || mkdir -p
"$XENSTORED_RUN_DIR"
+ xend start
+ await_daemons_up
+ ;;
+diff -ru xen-3.0.1.orig/tools/examples/init.d/xendomains
xen-3.0.1/tools/examples/init.d/xendomains
+--- xen-3.0.1.orig/tools/examples/init.d/xendomains 2006-01-31
17:09:20.000000000 +0100
++++ xen-3.0.1/tools/examples/init.d/xendomains 2006-03-21 18:27:54.000000000
+0100
+@@ -30,7 +30,7 @@
+
+ # Correct exit code would probably be 5, but it''s enough
+ # if xend complains if we''re not running as privileged domain
+-if ! [ -e /proc/xen/privcmd ]; then
++if [ ! -e /proc/xen/privcmd -a -x /usr/sbin/xm ]; then
+ exit 0
+ fi
+
+@@ -474,7 +474,7 @@
+ restart)
+ restart
+ ;;
+- reload)
++ reload|force-reload)
+ reload
+ ;;
+
+@@ -492,7 +492,7 @@
+ ;;
+
+ *)
+- echo "Usage: $0 {start|stop|restart|reload|status}"
++ echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
+ rc_failed 3
+ rc_status -v
+ ;;
Deleted: trunk/xen-3.0/debian/patches/xenstored_rundir.dpatch
==================================================================---
trunk/xen-3.0/debian/patches/xenstored_rundir.dpatch 2006-03-21 17:08:49 UTC
(rev 128)
+++ trunk/xen-3.0/debian/patches/xenstored_rundir.dpatch 2006-03-21 17:31:32 UTC
(rev 129)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## xenstored_rundir.dpatch by Julien Danjou <acid@debian.org>
-##
-## All lines beginning with `## DP:'' are a description of the patch.
-## DP: Create xenstored run directory.
-
-@DPATCH@
-diff -ru xen-3.0.1.orig/tools/examples/init.d/xend
xen-3.0.1/tools/examples/init.d/xend
---- xen-3.0.1.orig/tools/examples/init.d/xend 2006-01-31 17:09:20.000000000
+0100
-+++ xen-3.0.1/tools/examples/init.d/xend 2006-03-20 15:14:48.000000000 +0100
-@@ -7,6 +7,8 @@
- # chkconfig: 2345 98 01
- # description: Starts and stops the Xen control daemon.
-
-+XENSTORED_RUN_DIR="/var/run/xenstored"
-+
- if ! [ -e /proc/xen/privcmd ]; then
- exit 0
- fi
-@@ -27,6 +29,7 @@
-
- case "$1" in
- start)
-+ [ -d "$XENSTORED_RUN_DIR" ] || mkdir -p
"$XENSTORED_RUN_DIR"
- xend start
- await_daemons_up
- ;;