From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 30 Jul 2008 08:22:24 +0000 (+0100)
Subject: xm: Enable a bootloader when using XM via Xen-API
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14165^2~85
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cacc71b1730ef62500480671014c1e64300e0871;p=xen.git

xm: Enable a bootloader when using XM via Xen-API

This enables the usage of a bootloader, i.e., pygrub, when starting a
domain using xm in Xen-API mode.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
---

diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py
index df104bf72e..7d834f37a1 100644
--- a/tools/python/xen/xm/xenapi_create.py
+++ b/tools/python/xen/xm/xenapi_create.py
@@ -389,7 +389,7 @@ class xenapi_create:
             "device":
                 vbd.attributes["device"].value,
             "bootable":
-                vbd.attributes["bootable"].value == "True",
+                vbd.attributes["bootable"].value == "1",
             "mode":
                 vbd.attributes["mode"].value,
             "type":
@@ -597,13 +597,15 @@ class sxp2xml:
             pv = document.createElement("pv")
             pv.attributes["kernel"] \
                 = get_child_by_name(image, "kernel", "")
-            pv.attributes["bootloader"] = ""
+            pv.attributes["bootloader"] \
+                = get_child_by_name(config, "bootloader", "")
             pv.attributes["ramdisk"] \
                 = get_child_by_name(image, "ramdisk", "")
             pv.attributes["args"] \
                 = "root=" + get_child_by_name(image, "root", "") \
                 + " " + get_child_by_name(image, "args", "")
-            pv.attributes["bootloader_args"] = ""
+            pv.attributes["bootloader_args"] \
+                = get_child_by_name(config, "bootloader_args","")
 
             vm.appendChild(pv)
         elif image[0] == "hvm":