Wed Jul 5 16:51:45 IST 2006 Mark McLoughlin <markmc@redhat.com>

        * xml.c: only set bootloader flag when we actually get
        a bootloader

diff --git a/ChangeLog b/ChangeLog
index 1c7e2230750051a80485dd76a99ad5ced8d6c5a2..9e7c2ce2c62249957a4394060d9ed6edab8929a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  5 16:51:45 IST 2006 Mark McLoughlin <markmc@redhat.com>
+
+       * xml.c: only set bootloader flag when we actually get
+       a bootloader
+       
 Tue Jul  4 13:50:55 CEST 2006 Daniel Veillard <veillard@redhat.com>
 
        * libvirt.spec.in proxy/Makefile.am: do the chown at the rpm packaging

diff --git a/src/xml.c b/src/xml.c
index e269a240cc4ce4daa1f426ab931f6d9ae3d17a78..b3ec2cedf2fef32866e8706178573d9dea6751ad 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -566,7 +566,7 @@ virDomainGetXMLDesc(virDomainPtr domain, int flags)
  * virDomainParseXMLOSDesc:
  * @xmldesc: string with the XML description
  * @buf: a buffer for the result S-Expr
- * @bootloader: indocate if a bootloader script was provided
+ * @bootloader: indicate if a bootloader script was provided
  *
  * Parse the OS part of the XML description and add it to the S-Expr in buf
  * This is a temporary interface as the S-Expr interface
@@ -914,7 +914,6 @@ virDomainParseXMLDesc(const char *xmldesc, char **name)
     if ((obj != NULL) && (obj->type == XPATH_STRING) &&
         (obj->stringval != NULL) && (obj->stringval[0] != 0)) {
        virBufferVSprintf(&buf, "(on_poweroff '%s')", obj->stringval);
-       bootloader = 1;
     }
     xmlXPathFreeObject(obj);
 
@@ -922,7 +921,6 @@ virDomainParseXMLDesc(const char *xmldesc, char **name)
     if ((obj != NULL) && (obj->type == XPATH_STRING) &&
         (obj->stringval != NULL) && (obj->stringval[0] != 0)) {
        virBufferVSprintf(&buf, "(on_reboot '%s')", obj->stringval);
-       bootloader = 1;
     }
     xmlXPathFreeObject(obj);
 
@@ -930,7 +928,6 @@ virDomainParseXMLDesc(const char *xmldesc, char **name)
     if ((obj != NULL) && (obj->type == XPATH_STRING) &&
         (obj->stringval != NULL) && (obj->stringval[0] != 0)) {
        virBufferVSprintf(&buf, "(on_crash '%s')", obj->stringval);
-       bootloader = 1;
     }
     xmlXPathFreeObject(obj);