aboutsummaryrefslogtreecommitdiffstats
path: root/tools/hotplug
diff options
context:
space:
mode:
authorIan Murray <murrayie@yahoo.co.uk>2013-05-23 11:33:34 +0100
committerIan Campbell <ian.campbell@citrix.com>2013-05-23 11:35:07 +0100
commit13b37b6e08679d810544c99e69cfd81b7d34db18 (patch)
tree69833ad4172e6475967887b07d353509818fcb7b /tools/hotplug
parent0bb8977dca01321b5ea6f86bf62431783a49a955 (diff)
downloadxen-13b37b6e08679d810544c99e69cfd81b7d34db18.tar.gz
xen-13b37b6e08679d810544c99e69cfd81b7d34db18.tar.bz2
xen-13b37b6e08679d810544c99e69cfd81b7d34db18.zip
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 ]
Diffstat (limited to 'tools/hotplug')
-rw-r--r--tools/hotplug/Linux/init.d/xendomains4
1 files changed, 3 insertions, 1 deletions
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