Author: waldi
Date: Wed Jul 5 18:47:45 2006
New Revision: 206
Added:
trunk/xen-unstable/debian/xen-ioemu-unstable.install
trunk/xen-unstable/debian/xen-utils-unstable.postinst
trunk/xen-unstable/debian/xen-utils-unstable.postrm
Modified:
trunk/xen-unstable/debian/xen-docs-unstable.install
trunk/xen-unstable/debian/xen-utils-unstable.xend.init
trunk/xen-unstable/debian/xen-utils-unstable.xendomains.init
Log:
Merge changes from 3.0.
Modified: trunk/xen-unstable/debian/xen-docs-unstable.install
=============================================================================---
trunk/xen-unstable/debian/xen-docs-unstable.install (original)
+++ trunk/xen-unstable/debian/xen-docs-unstable.install Wed Jul 5 18:47:45 2006
@@ -1 +1 @@
-usr/share/doc/xen/pdf/* usr/share/doc/xen-docs-3.0
+usr/share/doc/xen/pdf/* usr/share/doc/xen-docs-unstable
Added: trunk/xen-unstable/debian/xen-ioemu-unstable.install
=============================================================================---
(empty file)
+++ trunk/xen-unstable/debian/xen-ioemu-unstable.install Wed Jul 5 18:47:45
2006
@@ -0,0 +1,4 @@
+usr/lib/xen/bin/qemu-dm
+usr/lib/xen/boot
+usr/share/xen/qemu
+etc/xen/qemu-ifup
Added: trunk/xen-unstable/debian/xen-utils-unstable.postinst
=============================================================================---
(empty file)
+++ trunk/xen-unstable/debian/xen-utils-unstable.postinst Wed Jul 5 18:47:45
2006
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+configure)
+ # Set up udev rules symlink
+ L="/etc/udev/rules.d/z60_xen-backend.rules"
+ [ ! -z "$2" ] || [ -e "$L" ] || [ -L "$L" ] ||
ln -s ../xen-backend.rules "$L"
+
+ XENSTORED_DIR="/var/lib/xenstored"
+ [ ! -d "${XENSTORED_DIR}" ] && install -d -m 0700
"${XENSTORED_DIR}"
+
+ ;;
+
+abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+*)
+ echo "postinst called with unknown argument \`$1''"
>&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: trunk/xen-unstable/debian/xen-utils-unstable.postrm
=============================================================================---
(empty file)
+++ trunk/xen-unstable/debian/xen-utils-unstable.postrm Wed Jul 5 18:47:45 2006
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+purge)
+ # Remove udev rules symlink
+ L="/etc/udev/rules.d/z60_xen-backend.rules"
+ [ -L "$L" ] && rm "$L"
+
+ XENSTORED_DIR="/var/lib/xenstored"
+ [ -d "${XENSTORED_DIR}" ] && rm -r
"${XENSTORED_DIR}"
+ ;;
+
+remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+*)
+ echo "postrm called with unknown argument \`$1''" >&2
+ exit
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/xen-unstable/debian/xen-utils-unstable.xend.init
=============================================================================---
trunk/xen-unstable/debian/xen-utils-unstable.xend.init (original)
+++ trunk/xen-unstable/debian/xen-utils-unstable.xend.init Wed Jul 5 18:47:45
2006
@@ -4,9 +4,11 @@
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
+grep -q "control_d" /proc/xen/capabilities || exit 0
# Wait for Xend to be up
await_daemons_up () {
@@ -27,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-unstable/debian/xen-utils-unstable.xendomains.init
=============================================================================---
trunk/xen-unstable/debian/xen-utils-unstable.xendomains.init (original)
+++ trunk/xen-unstable/debian/xen-utils-unstable.xendomains.init Wed Jul 5
18:47:45 2006
@@ -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
;;