[Pkg-xen-changes] r168 - trunk/xen-3.0/debian

[Julien Danjou]

Author: acid
Date: 2006-04-11 20:51:46 +0000 (Tue, 11 Apr 2006)
New Revision: 168

Modified:
   trunk/xen-3.0/debian/control
   trunk/xen-3.0/debian/xen-utils-3.0.xend.init
   trunk/xen-3.0/debian/xen-utils-3.0.xendomains.init
Log:
* debian/control: recommends libc6-xen
* debian/xen-utils-3.0.xend.init: mkdir $XENSTORED_RUN_DIR
* debian/xen-utils-3.0.xendomains.init check that xm is +x


Modified: trunk/xen-3.0/debian/control
===================================================================
--- trunk/xen-3.0/debian/control	2006-04-11 14:05:44 UTC (rev 167)
+++ trunk/xen-3.0/debian/control	2006-04-11 20:51:46 UTC (rev 168)
@@ -48,7 +48,7 @@
 Package: xen-utils-3.0
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${python:Depends}, xen-hypervisor-3.0, iproute, udev (>> 0.060)
-Recommends: bridge-utils
+Recommends: bridge-utils, libc6-xen
 Provides: xen-utils
 Conflicts: xen-utils, xen, libxen-python, libxen2.0, libxen2.0-dev
 Description: XEN administrative tools

Modified: trunk/xen-3.0/debian/xen-utils-3.0.xend.init
===================================================================
--- trunk/xen-3.0/debian/xen-utils-3.0.xend.init	2006-04-11 14:05:44 UTC (rev 167)
+++ trunk/xen-3.0/debian/xen-utils-3.0.xend.init	2006-04-11 20:51:46 UTC (rev 168)
@@ -4,6 +4,7 @@
 DAEMON=/usr/sbin/xend
 NAME=xend
 DESC=XEN
+XENSTORED_RUN_DIR="/var/run/xenstored"
 
 test -x $DAEMON || exit 0
 test -e /proc/xen/privcmd || exit 0
@@ -28,6 +29,7 @@
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
+	[ -d "$XENSTORED_RUN_DIR" ] || mkdir -p "$XENSTORED_RUN_DIR"
 	xend start
 	await_daemons_up
 	echo "$NAME."

Modified: trunk/xen-3.0/debian/xen-utils-3.0.xendomains.init
===================================================================
--- trunk/xen-3.0/debian/xen-utils-3.0.xendomains.init	2006-04-11 14:05:44 UTC (rev 167)
+++ trunk/xen-3.0/debian/xen-utils-3.0.xendomains.init	2006-04-11 20:51:46 UTC (rev 168)
@@ -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
 
@@ -464,7 +464,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
 	;;