[Pkg-xen-changes] [xen] 33/34: Remove various traces of xend from the packaging.
Ian James Campbell
ijc at moszumanska.debian.org
Tue Dec 9 12:49:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
ijc pushed a commit to branch feature/experimental-rc3
in repository xen.
commit fc268c9f48a3f9c627e1627151f748254e22000f
Author: Ian Campbell <ijc at hellion.org.uk>
Date: Fri Nov 7 14:03:25 2014 +0000
Remove various traces of xend from the packaging.
---
debian/rules.real | 1 -
debian/scripts/Makefile | 3 +-
debian/scripts/xen-toolstack | 7 +-
.../usr/share/xen-utils-common/default.xen | 8 +++
debian/xen-utils-common.examples | 1 -
debian/xen-utils-common.install | 1 -
debian/xen-utils-common.xen.init | 83 +---------------------
debian/xen-utils-common.xend.default | 2 -
debian/xen-utils-common.xendomains.default | 6 +-
debian/xen-utils-common.xendomains.init | 2 +-
debian/xen-utils.README.Debian | 5 --
11 files changed, 16 insertions(+), 103 deletions(-)
diff --git a/debian/rules.real b/debian/rules.real
index 47b6368..780ffec 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -228,7 +228,6 @@ install-utils-common: $(STAMPS_DIR)/install-utils-common
dh_prep
dh_install -X .svn --sourcedir=$(DIR)
dh_installinit --name xen -- defaults 20 21
- dh_installinit --name xend
dh_installinit --name xendomains --no-start -- defaults 21 20
dh_installman $(SOURCE_DIR)/docs/man1/* $(SOURCE_DIR)/docs/man5/* \
$(SOURCE_DIR)/tools/xentrace/xentrace_format.1 \
diff --git a/debian/scripts/Makefile b/debian/scripts/Makefile
index 22d9a82..bec6a59 100644
--- a/debian/scripts/Makefile
+++ b/debian/scripts/Makefile
@@ -5,8 +5,7 @@ GLOBAL_SCRIPTS = \
xen
GLOBAL_TOOLSTACK_LINKS = \
- xl \
- xm
+ xl
GLOBAL_TOOLSTACK_WRAPPER = xen-toolstack-wrapper
diff --git a/debian/scripts/xen-toolstack b/debian/scripts/xen-toolstack
index 3a36fd0..29ed60c 100755
--- a/debian/scripts/xen-toolstack
+++ b/debian/scripts/xen-toolstack
@@ -6,7 +6,7 @@ dir=$(. /usr/lib/xen-common/bin/xen-dir); ret=$?; [ $ret -eq 0 ] || exit $ret
check() {
local PATH
- if [ "$1" = xm ] || [ "$1" = xl ]; then
+ if [ "$1" = xl ]; then
PATH="$dir/bin"
else
PATH="$dir/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
@@ -29,11 +29,8 @@ if [ "$TOOLSTACK" ]; then
fi
if [ -z "$TOOLSTACK" ]; then
- cmd_xm=$(check xm)
cmd_xl=$(check xl)
- if [ "$cmd_xm" ]; then
- echo "$cmd_xm"
- elif [ "$cmd_xl" ]; then
+ if [ "$cmd_xl" ]; then
echo "$cmd_xl"
else
echo "ERROR: Toolstack not specifed and nothing detected, bailing out!" >&2
diff --git a/debian/tree/xen-utils-common/usr/share/xen-utils-common/default.xen b/debian/tree/xen-utils-common/usr/share/xen-utils-common/default.xen
index 65f5196..dd3b295 100644
--- a/debian/tree/xen-utils-common/usr/share/xen-utils-common/default.xen
+++ b/debian/tree/xen-utils-common/usr/share/xen-utils-common/default.xen
@@ -5,3 +5,11 @@
# …
# Attention: You need to reboot after changing this!
TOOLSTACK=
+
+# Arguments to pass to xenconsoled:
+# --log=[none|guest|hv|all]
+XENCONSOLED_ARGS=
+
+# Arguments to pass to xenstored:
+# -T /var/log/xen/xenstored-trace.log
+XENSTORED_ARGS=
diff --git a/debian/xen-utils-common.examples b/debian/xen-utils-common.examples
index 50cee55..f296b66 100644
--- a/debian/xen-utils-common.examples
+++ b/debian/xen-utils-common.examples
@@ -1,2 +1 @@
debian/tmp/etc/xen/cpupool*
-debian/tmp/etc/xen/xm*
diff --git a/debian/xen-utils-common.install b/debian/xen-utils-common.install
index 57a95cc..3ea6597 100644
--- a/debian/xen-utils-common.install
+++ b/debian/xen-utils-common.install
@@ -4,4 +4,3 @@ lib/udev/rules.d/*.rules
usr/lib/xen-common
usr/sbin
../../tree/xen-utils-common/* /
-../../../tools/examples/xend*
diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init
index b903877..ec3a17d 100644
--- a/debian/xen-utils-common.xen.init
+++ b/debian/xen-utils-common.xen.init
@@ -1,6 +1,6 @@
#!/bin/sh
### BEGIN INIT INFO
-# Provides: xen xend
+# Provides: xen
# Required-Start: $syslog $remote_fs
# Required-Stop: $syslog $remote_fs
# Default-Start: 2 3 4 5
@@ -16,7 +16,6 @@
XENSTORED_DIR="/var/run/xenstored"
[ -r /etc/default/xen ] && . /etc/default/xen
-[ -r /etc/default/xend ] && . /etc/default/xend
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DESC="Xen daemons"
@@ -32,7 +31,6 @@ if [ $? -ne 0 ]; then
exit 0
fi
-[ -e "$ROOT"/bin/xend ] && XEND="$ROOT"/bin/xend
XENCONSOLED="$ROOT"/bin/xenconsoled
XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid"
XENSTORED="$ROOT"/bin/xenstored
@@ -68,70 +66,6 @@ env_setup()
mkdir -m 700 /run/xen
}
-xend_start()
-{
- if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then
- return 0
- fi
-
- log_progress_msg "xend"
- xend_start_real
- return $?
-}
-
-xend_stop()
-{
- if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then
- return 0
- fi
-
- log_progress_msg "xend"
- xend_stop_real
- return $?
-}
-
-xend_restart()
-{
- if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then
- return 0
- fi
-
- log_progress_msg "xend"
- xend_stop_real
- case "$?" in
- 0|1)
- xend_start_real
- case "$?" in
- 0) ;;
- *) return 2 ;;
- esac
- ;;
- *) return 2 ;;
- esac
- return 0
-}
-
-xend_start_real()
-{
- $XEND status && return 1
- $XEND start || return 2
-
- i=0
- while [ $i -lt 10 ]; do
- $XEND status && return 0 || true
- i=$(($i + 1))
- sleep 1
- done
- return 2
-}
-
-xend_stop_real()
-{
- log_progress_msg "xend"
- $XEND status || return 0
- $XEND stop || return 1
-}
-
xenconsoled_start()
{
log_progress_msg "xenconsoled"
@@ -222,11 +156,6 @@ case "$1" in
0|1) ;;
*) log_end_msg 1; exit ;;
esac
- xend_start
- case "$?" in
- 0|1) ;;
- *) log_end_msg 1; exit ;;
- esac
log_end_msg 0
;;
stop)
@@ -237,11 +166,6 @@ case "$1" in
esac
log_daemon_msg "Stopping $DESC"
ret=0
- xend_stop
- case "$?" in
- 0|1) ;;
- *) ret=1 ;;
- esac
xenconsoled_stop
case "$?" in
0|1) ;;
@@ -257,11 +181,6 @@ case "$1" in
esac
log_daemon_msg "Restarting $DESC"
ret=0
- xend_restart
- case "$?" in
- 0|1) ;;
- *) ret=1 ;;
- esac
xenconsoled_restart
case "$?" in
0|1) ;;
diff --git a/debian/xen-utils-common.xend.default b/debian/xen-utils-common.xend.default
deleted file mode 100644
index 589da35..0000000
--- a/debian/xen-utils-common.xend.default
+++ /dev/null
@@ -1,2 +0,0 @@
-XENCONSOLED_ARGS=
-XENSTORED_ARGS=
diff --git a/debian/xen-utils-common.xendomains.default b/debian/xen-utils-common.xendomains.default
index 34aeb12..671e713 100644
--- a/debian/xen-utils-common.xendomains.default
+++ b/debian/xen-utils-common.xendomains.default
@@ -6,7 +6,7 @@
# XENDOMAINS_SYSRQ=
# Set this to a non-empty string if you want to migrate virtual machines
-# on shutdown. The string will be passed to the xm migrate DOMID command
+# on shutdown. The string will be passed to the xl migrate DOMID command
# as is: It should contain the target IP address of the physical machine
# to migrate to and optionally parameters like --live. Leave empty if
# you don't want to try virtual machine relocation on shutdown.
@@ -39,11 +39,11 @@ XENDOMAINS_RESTORE=true
#
XENDOMAINS_AUTO=/etc/xen/auto
-# On xendomains stop, a number of xm commands (xm migrate, save, shutdown,
+# On xendomains stop, a number of xl commands (xl migrate, save, shutdown,
# shutdown --all) may be executed. In the worst case, these commands may
# stall forever, which will prevent a successful shutdown of the machine.
# If this variable is non-zero, the script will set up a watchdog timer
-# for every of these xm commands and time it out after the number of seconds
+# for every of these xl commands and time it out after the number of seconds
# specified by this variable.
# Note that SHUTDOWN_ALL will not be called if no virtual machines or only
# zombies are still running, so you don't need to enable this timeout just
diff --git a/debian/xen-utils-common.xendomains.init b/debian/xen-utils-common.xendomains.init
index 5fd5a5d..d3f0a80 100644
--- a/debian/xen-utils-common.xendomains.init
+++ b/debian/xen-utils-common.xendomains.init
@@ -28,7 +28,7 @@ if [ $? -ne 0 ]; then
log_warning_msg "No usable Xen toolstack selected"
exit 0
fi
-if [ "$(basename "$TOOLSTACK")" != xm ] && [ "$(basename "$TOOLSTACK")" != xl ]; then
+if [ "$(basename "$TOOLSTACK")" != xl ]; then
exit 0
fi
diff --git a/debian/xen-utils.README.Debian b/debian/xen-utils.README.Debian
index 33bc454..30bdc8f 100644
--- a/debian/xen-utils.README.Debian
+++ b/debian/xen-utils.README.Debian
@@ -23,11 +23,6 @@ differs from the upstream version, which overwrites the main network card
To setup a bridge please follow the instructions in the manpage for
bridge-utils-interfaces(5).
-You can also change the /etc/xen/xend-config.sxp file and re-enable the Xen
-included network setup by adding
- (network-script network-bridge)
-to the file. But please note that this may or may not work.
-
Loop devices
------------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list