[Pkg-xen-devel] Bug#680528: xen-utils-common: Please disable xendomains auto-start

[Ian Campbell]

Control: tag -1 +patch

(experimenting with http://www.donarmstrong.com/posts/control_at_submit/ ...)

Hi Thomas,

I think it is as simple as the following, which works for me with xl and
xm. Does it work as you expect/want with xe?

Ian.


>From 88f10bc8dbf96dd2c32f12259249f8be70fd01a4 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc at hellion.org.uk>
Date: Thu, 19 Jul 2012 16:19:09 +0100
Subject: [PATCH] * debian/xen-utils-common.xendomains.init: Do not act unless
 TOOLSTCK is xm or xl * debian/changelog: Update

---
 xen/debian/changelog                        |    1 +
 xen/debian/xen-utils-common.xendomains.init |    8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/xen/debian/changelog b/xen/debian/changelog
index 0da02db..f9dad5a 100644
--- a/xen/debian/changelog
+++ b/xen/debian/changelog
@@ -3,6 +3,7 @@ xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-5) UNRELEASED; urgency=low
   [ 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)
+  * xendomains initscript only acts if toolstack is xl or xm (Closes: #680528)
 
   [ Bastian Blank ]
   * Actually build-depend on new enough version of dpkg-dev.
diff --git a/xen/debian/xen-utils-common.xendomains.init b/xen/debian/xen-utils-common.xendomains.init
index df4265c..6f08b92 100644
--- a/xen/debian/xen-utils-common.xendomains.init
+++ b/xen/debian/xen-utils-common.xendomains.init
@@ -23,6 +23,14 @@ then
 	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
-- 
1.7.10


-- 
Ian Campbell
Current Noise: Exodus - The Last Act Of Defiance

The reason that every major university maintains a department of
mathematics is that it's cheaper than institutionalizing all those people.