Re: [Xen-devel] [Patch[ xl problems with xendomains

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2013-05-22 at 10:53 +0100, Ian Campbell wrote:

> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> 
> That actual patch seems to be a bit mangled (looks like an unresolved
> git conflict 3 way diff thing). Since it is simple I can fix it up as I
> apply.

FYI what I applied was, please check that it is correct:

commit 13b37b6e08679d810544c99e69cfd81b7d34db18
Author: Ian Murray <murrayie@xxxxxxxxxxx>
Date:   Thu May 23 11:33:34 2013 +0100

    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@xxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    [ ijc -- rewrote commit message ]

diff --git a/tools/hotplug/Linux/init.d/xendomains 
b/tools/hotplug/Linux/init.d/xendomains
index 2a1999a..730541e 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



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel