[Pkg-xen-changes] r1074 - branches/wheezy/xen/debian

[Ian Campbell]

Author: ijc-guest
Date: Fri Jul 20 18:30:04 2012
New Revision: 1074

Log:
* debian/xen-utils-common.xendomains.init: Do not run unless TOOLSTACK is xm or xl
* debian/changelog: Update

Modified:
   branches/wheezy/xen/debian/changelog
   branches/wheezy/xen/debian/xen-utils-common.xendomains.init

Modified: branches/wheezy/xen/debian/changelog
==============================================================================
--- branches/wheezy/xen/debian/changelog	Sat Jul 14 22:22:38 2012	(r1073)
+++ branches/wheezy/xen/debian/changelog	Fri Jul 20 18:30:04 2012	(r1074)
@@ -3,6 +3,7 @@
   [ Ian Campbell ]
   * Set tap device MAC addresses to fe:ff:ff:ff:ff:ff (Closes: #671018)
   * Make xen-hypervisor-$flavour a real package to aid upgrade (Closes: #681376)
+  * Only run xendomains initscript if toolstack is xl or xm (Closes: #680528)
 
   [ Bastian Blank ]
   * Actually build-depend on new enough version of dpkg-dev.

Modified: branches/wheezy/xen/debian/xen-utils-common.xendomains.init
==============================================================================
--- branches/wheezy/xen/debian/xen-utils-common.xendomains.init	Sat Jul 14 22:22:38 2012	(r1073)
+++ branches/wheezy/xen/debian/xen-utils-common.xendomains.init	Fri Jul 20 18:30:04 2012	(r1074)
@@ -23,6 +23,15 @@
 	exit 0;
 fi
 
+TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null)
+if [ $? -ne 0 ]; then
+        log_warning_msg "No usable Xen toolstack selected"
+        exit 0
+fi
+if [ "$(basename "$TOOLSTACK")" != xm ] && [ "$(basename "$TOOLSTACK")" != xl ]; then
+	exit 0
+fi
+
 if ! [ -e /proc/xen/privcmd ]; then
 	exit 0
 fi