From: Ian Murray <murrayie@yahoo.co.uk>
Date: Thu, 23 May 2013 10:33:34 +0000 (+0100)
Subject: hotplug/Linux: xendomains compatibility with xl
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6794
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=13b37b6e08679d810544c99e69cfd81b7d34db18;p=xen.git

hotplug/Linux: xendomains compatibility with xl

The xl save file uses a different header string to the xm one. Teach the
xendomains script about it.

Signed-off-by: Ian MURRAY <murrayie@yahoo.co.uk>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- rewrote commit message ]
---

diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains
index 2a1999a8b2..730541ec2e 100644
--- a/tools/hotplug/Linux/init.d/xendomains
+++ b/tools/hotplug/Linux/init.d/xendomains
@@ -30,10 +30,12 @@
 . /etc/xen/scripts/hotplugpath.sh
 
 CMD=${SBINDIR}/xm
+HEADCOMP="LinuxGuestRecord"
 $CMD list &> /dev/null
 if test $? -ne 0
 then
 	CMD=${SBINDIR}/xl
+	HEADCOMP="Xen saved domain"
 fi
 
 $CMD list &> /dev/null
@@ -257,7 +259,7 @@ start()
         for dom in $XENDOMAINS_SAVE/*; do
             if [ -f $dom ] ; then
                 HEADER=`head -c 16 $dom | head -n 1 2> /dev/null`
-                if [ $HEADER = "LinuxGuestRecord" ]; then
+                if [ "$HEADER" = "$HEADCOMP" ]; then
                     echo -n " ${dom##*/}"
                     XMR=`$CMD restore $dom 2>&1 1>/dev/null`
                     #$CMD restore $dom