Author: waldi
Date: Tue Jan 31 15:26:20 2012
New Revision: 962
Log:
* debian/changelog
* debian/xen-utils-common.xend.init: Restart and stop xenconsoled.
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/xen-utils-common.xend.init
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Tue Jan 31 14:09:59 2012 (r961)
+++ trunk/xen/debian/changelog Tue Jan 31 15:26:20 2012 (r962)
@@ -4,6 +4,7 @@
* Remove xend wrapper, it should not be called by users.
* Support xl in init script.
* Restart xen daemons on upgrade.
+ * Restart and stop xenconsoled in init script.
-- Bastian Blank <waldi at debian.org> Tue, 31 Jan 2012 14:07:41 +0100
Modified: trunk/xen/debian/xen-utils-common.xend.init
=============================================================================---
trunk/xen/debian/xen-utils-common.xend.init Tue Jan 31 14:09:59 2012 (r961)
+++ trunk/xen/debian/xen-utils-common.xend.init Tue Jan 31 15:26:20 2012 (r962)
@@ -94,6 +94,18 @@
|| return 2
}
+xenconsoled_stop()
+{
+ log_progress_msg "xenconsoled"
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile
"$XENCONSOLED_PIDFILE" --name xenconsoled
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec
"$XENCONSOLED"
+ [ "$?" = 2 ] && return 2
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
xenstored_start()
{
log_progress_msg "xenstored"
@@ -146,9 +158,15 @@
log_daemon_msg "Stopping $DESC"
xend_stop
case "$?" in
- 0|1) log_end_msg 0 ;;
+ 0|1) ;;
*) log_end_msg 1 ;;
esac
+ xenconsoled_stop
+ case "$?" in
+ 0|1) ;;
+ *) log_end_msg 1 ;;
+ esac
+ log_end_msg 0
;;
restart|force-reload)
capability_check
@@ -162,12 +180,24 @@
0|1)
xend_start
case "$?" in
- 0) log_end_msg 0 ;;
+ 0) ;;
*) log_end_msg 1 ;;
esac
;;
*) log_end_msg 1 ;;
esac
+ xenconsoled_stop
+ case "$?" in
+ 0|1)
+ xenconsoled_start
+ case "$?" in
+ 0) ;;
+ *) log_end_msg 1 ;;
+ esac
+ ;;
+ *) log_end_msg 1 ;;
+ esac
+ log_end_msg 0
;;
*)
echo "Usage: $0 {start|stop|restart|force-reload}" >&2